93a76deb27
Clean up prison button code a bit
...
Add nicer confirmation message
Change access restriction from FUN to admins
Remove paralyzation\sleep
2014-07-22 12:43:32 -07:00
92ef19b8b9
Don't make imprisoned players lose all thier stuff
2014-07-18 23:05:14 -07:00
3f12c04b27
Fix nonfunctional Prison button on Player Panel
2014-07-18 23:03:57 -07:00
8b0c9b4950
Merge pull request #4162 from Kelenius/OfCamerasAndLights
...
Makes camera lights not broken
2014-07-18 09:33:41 +01:00
b67a751d57
Small fixes for camera lights
2014-07-18 02:44:26 +04:00
b938ad2dde
Camera light uses cameranet and updates on movement now
2014-07-18 02:26:47 +04:00
80824ecac3
Changes light to Giacom's suggestion
2014-07-17 23:59:58 +04:00
d146eca7b1
Merge pull request #4149 from paprka/lemonlime
...
Updates epic deus ex soda joke
2014-07-17 09:31:40 +01:00
2d4ca8d363
Merge pull request #4150 from Ikarrus/miningfix
...
[MAP] Mining Delivery System
2014-07-17 09:30:19 +01:00
9a1a52d280
Merge pull request #4143 from paprka/hatstuff
...
Hat/helmet tweaks
2014-07-17 09:29:14 +01:00
06bcfbb638
Merge pull request #4154 from paprka/HALTSCUMBAG
...
"HALT" sec hailer clip shortened
2014-07-17 09:27:45 +01:00
9150770991
Merge pull request #4165 from Cheridan/go_ape2
...
MONKEY MODE: COLON CANCER EXCISION EDITION
2014-07-17 07:48:11 +01:00
76e9fed50c
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-15 22:36:54 +02:00
8fdd519401
Merge branch 'master' of https://github.com/tgstation/-tg-station into go_ape
2014-07-15 14:31:45 -05:00
094d7d139b
Makes camera lights not broken
2014-07-15 20:06:04 +04:00
0883d5994d
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
2014-07-15 13:52:44 +02:00
a10f614ec4
armor
2014-07-14 12:44:38 -07:00
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
5deccb030c
Merge pull request #4125 from Jordie0608/mygrandmacheatedconstantlyatsnapwheniwasatoddler
...
AI spacecarp hologram
2014-07-14 09:25:37 +01:00
07a16bbbf7
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-14 06:06:04 +02:00
d853909f2b
HALT HALT HALT
2014-07-13 15:43:32 -07:00
d0f7641bd0
syndies use swat helmets too!
2014-07-13 14:38:34 -07:00
4db7359cf6
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:34:44 +02:00
e13e4ca445
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:32:34 +02:00
d5a7885842
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:29:37 +02:00
0a62bfb159
part II
2014-07-13 13:43:07 -06:00
9d2bed1501
[MAP] Mining Delivery System
...
-Redone the delivery system on mining to send the unrefined ore from the outposts to the mining station, ready to be picked up by miners, instead of being fed directly into the smelting line
-Smelting line still exists, but starts blocked off
-Updated paper with correct instructions on where to redeem points
-Fixed mint's atmos and door name. Added a camera there, too.
2014-07-13 13:30:57 -06:00
bcbcb204a5
updates epic deus ex joke
2014-07-13 11:33:33 -07:00
b24d0561c7
fixes redundant flag removal
2014-07-13 10:00:44 -07:00
46690daed6
small tweak to desc
2014-07-12 18:11:38 -07:00
2f78ee55ed
buff to job hats
2014-07-12 18:01:12 -07:00
0dc8aabd42
Revert "Spinning"
2014-07-13 00:55:18 +01:00
dec8444e12
Merge pull request #4118 from Aranclanos/spinning
...
Spinning
2014-07-12 20:52:55 -03:00
4b188a4dea
Merge pull request #4139 from Aranclanos/immovablerods
...
Fixed the crash with immovable rods
2014-07-12 20:46:06 -03:00
33ee96dc39
Fixed the crash with immovable rods
2014-07-12 20:44:48 -03:00
d8c9c8de9b
Merge pull request #4131 from paprka/fixxies
...
Paprika's epic fixes and shit
2014-07-12 21:11:31 +01:00
4eb83ed546
Oh, not in cruelty, not in wrath
...
The Reaper came that day;
An angel visited this damned sat,
And took the parapen away.
Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.
Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
2014-07-12 17:48:33 +02:00
46c3a61fca
Merge pull request #4071 from CollenN/panelfix
...
Spawned humans have DNA, strip panel is better
2014-07-11 19:02:50 +01:00
537d135d82
Merge pull request #4113 from SodiumShine/cuffs-fix
...
Fixes handcuffs persisting visually after resist.
2014-07-11 15:02:06 +01:00
8bc96dcfdc
check for legcuffs too
2014-07-11 21:12:26 +10:00
dde416fdea
Fixed fix for persisting handcuffs sprite (Legcuffs/handcuffs mixup)
2014-07-11 16:16:40 +10:00
58c12ae7bb
Merge branch 'master' of https://github.com/SodiumShine/-tg-station into cuffs-fix
2014-07-11 15:34:52 +10:00
b92397a2e3
paprikkas gay
2014-07-10 20:12:24 -07:00
b313228586
Fixes pAI SecHUDs
...
Replaces "return" with "continue" on line 29. "return" was prematurely terminating the loop, causing pAIs to only see one or a few HUD icons at a time.
I plan to extend these HUDs to the AI in the future, after the freeze.
2014-07-10 09:16:56 -05:00
4066fe0d1e
ai spacecarp hologram
2014-07-10 23:33:03 +10:00
fdba3e8247
Merge pull request #4105 from Cheridan/bugslaying
...
Further Hydro Cleanup
2014-07-10 13:10:49 +01:00
8115d1dd75
Merge pull request #4114 from quiltyquilty/testing
...
fixes spagetti typo
2014-07-10 13:08:25 +01:00
d26085f794
Merge pull request #4119 from MrPerson/only_the_dead_know_peace_from_jittering
...
Make dead people stop jittering
2014-07-10 13:08:00 +01:00
87ca321900
Merge pull request #4107 from Firecage/Bugfixesgalore
...
Roman fix for issue #4101 Fixed #4101
2014-07-09 12:29:01 +01:00
41d3858769
Make dead people stop jittering
...
Fixes #3690
2014-07-09 02:19:01 -07:00
Kyle Franz
Alex
Kelenius
Firecage
Cheridan
paprka
ikarrus
Aranclanos
Miauw
A
GunHog
Jordie0608
MrPerson