 Kyle Franz
|
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 |
|
|
Kyle Franz
|
92ef19b8b9
|
Don't make imprisoned players lose all thier stuff
|
2014-07-18 23:05:14 -07:00 |
|
|
Kyle Franz
|
3f12c04b27
|
Fix nonfunctional Prison button on Player Panel
|
2014-07-18 23:03:57 -07:00 |
|
|
Swag McYolosteinen
|
ed43664e5f
|
Merge pull request #4177 from Firecage/master
Some Bug Fixes
|
2014-07-18 17:08:40 +02:00 |
|
|
Alex
|
8b0c9b4950
|
Merge pull request #4162 from Kelenius/OfCamerasAndLights
Makes camera lights not broken
|
2014-07-18 09:33:41 +01:00 |
|
|
Kelenius
|
b67a751d57
|
Small fixes for camera lights
|
2014-07-18 02:44:26 +04:00 |
|
|
Kelenius
|
b938ad2dde
|
Camera light uses cameranet and updates on movement now
|
2014-07-18 02:26:47 +04:00 |
|
|
Kelenius
|
80824ecac3
|
Changes light to Giacom's suggestion
|
2014-07-17 23:59:58 +04:00 |
|
|
Firecage
|
750652bcf6
|
Improves objective text
|
2014-07-17 19:06:10 +02:00 |
|
|
Firecage
|
4c19c964aa
|
Eject for Processors
|
2014-07-17 17:47:09 +02:00 |
|
|
Firecage
|
e625a0137c
|
Thermiting stuff funny
|
2014-07-17 15:53:26 +02:00 |
|
|
Firecage
|
84afa90999
|
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
|
2014-07-17 15:45:30 +02:00 |
|
|
Firecage
|
2f1bb11bcd
|
Lighting Thermite FUN
|
2014-07-17 15:44:53 +02:00 |
|
|
Alex
|
2f0e274a8a
|
Updated README. We don't use SVN anymore.
|
2014-07-17 11:36:58 +01:00 |
|
|
Alex
|
d146eca7b1
|
Merge pull request #4149 from paprka/lemonlime
Updates epic deus ex soda joke
|
2014-07-17 09:31:40 +01:00 |
|
|
Alex
|
2d4ca8d363
|
Merge pull request #4150 from Ikarrus/miningfix
[MAP] Mining Delivery System
|
2014-07-17 09:30:19 +01:00 |
|
|
Alex
|
9a1a52d280
|
Merge pull request #4143 from paprka/hatstuff
Hat/helmet tweaks
|
2014-07-17 09:29:14 +01:00 |
|
|
Alex
|
06bcfbb638
|
Merge pull request #4154 from paprka/HALTSCUMBAG
"HALT" sec hailer clip shortened
|
2014-07-17 09:27:45 +01:00 |
|
|
Alex
|
9150770991
|
Merge pull request #4165 from Cheridan/go_ape2
MONKEY MODE: COLON CANCER EXCISION EDITION
|
2014-07-17 07:48:11 +01:00 |
|
|
Alex
|
fa6d76bd9b
|
Merge pull request #4137 from GunHog/AI_HUD_Snapwalk_icons
New Sprites for AI HUD!
|
2014-07-16 22:04:08 +01:00 |
|
|
Alex
|
597bc2a98c
|
Merge pull request #4160 from Miauw62/fix
Fixed #1742 (Cargo computer stuck on "Invalid Request")
|
2014-07-16 19:52:57 +01:00 |
|
|
Firecage
|
fc4c299252
|
Lighting cigarettes with flares/torches
Signed-off-by: Firecage <firecage@hotmail.com>
|
2014-07-16 16:34:42 +02:00 |
|
|
Cheridan
|
e6719cced3
|
Merge pull request #4151 from Firecage/master
Fixes Botany Plants.
|
2014-07-15 19:54:46 -05:00 |
|
|
Cheridan
|
7fa5246168
|
Merge pull request #4158 from Jordie0608/therearewaytoomanytypesofpastaandmostlookthesame
Meatballspagetti -> Meatballspaghetti
|
2014-07-15 19:10:48 -05:00 |
|
|
Cheridan
|
ac94829dbe
|
Update monkey.dm
2 people monkey rounds are the best
|
2014-07-15 18:13:41 -05:00 |
|
|
Firecage
|
76e9fed50c
|
Signed-off-by: Firecage <firecage@hotmail.com>
|
2014-07-15 22:36:54 +02:00 |
|
|
Cheridan
|
8fdd519401
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into go_ape
|
2014-07-15 14:31:45 -05:00 |
|
|
Cheridan
|
7aebca9d01
|
fixes the colon 'issue' by making the code worse
thanks obama
|
2014-07-15 14:30:33 -05:00 |
|
|
Kelenius
|
094d7d139b
|
Makes camera lights not broken
|
2014-07-15 20:06:04 +04:00 |
|
|
Miauw
|
69e531d889
|
does what gia says
|
2014-07-15 17:03:49 +02:00 |
|
|
Miauw
|
320f28bd57
|
Fixed #1742
|
2014-07-15 15:09:59 +02:00 |
|
|
Firecage
|
0883d5994d
|
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
|
2014-07-15 13:52:44 +02:00 |
|
|
GunHog
|
4483fe0159
|
Blue-Green HUD icons
Updates the spriteset!
|
2014-07-14 23:15:58 -05:00 |
|
|
paprka
|
a10f614ec4
|
armor
|
2014-07-14 12:44:38 -07:00 |
|
|
Jordie0608
|
0a2b1b6b68
|
Meatballspagetti -> Meatballspaghetti
|
2014-07-15 02:06:48 +10:00 |
|
|
Alex
|
cf7c466779
|
Merge pull request #4144 from Rockdtben/securityPDA
PDA - Security Records were missing tables.
|
2014-07-14 14:17:11 +01:00 |
|
|
Alex
|
0e62b4ce15
|
Merge pull request #4157 from Miauw62/changelog894684
Changelog for #4059
|
2014-07-14 12:57:52 +01:00 |
|
|
Miauw
|
77163be2fb
|
descriptive commit name
|
2014-07-14 13:57:01 +02:00 |
|
|
Miauw
|
d9a7d75180
|
Changelog for #4059
|
2014-07-14 13:52:42 +02:00 |
|
|
Alex
|
72423a7bd0
|
Merge pull request #4059 from Miauw62/goodbyeparapen
Replaces the parapen
|
2014-07-14 12:47:14 +01:00 |
|
|
Miauw
|
9173a46bfd
|
Makes C4 unable to be planted on mobs and reduces C4 cost to 1 TC
|
2014-07-14 13:28:42 +02:00 |
|
|
Alex
|
d0e7cee156
|
Merge pull request #4138 from Menshin/LetsBeAStar
Dedust an ancient dark ritual : A*
|
2014-07-14 11:27:03 +01:00 |
|
|
Alex
|
eddcde41a8
|
Merge pull request #4135 from Rolan7/Issue_1919
Fixes tray layer issue
|
2014-07-14 09:26:05 +01:00 |
|
|
Alex
|
5deccb030c
|
Merge pull request #4125 from Jordie0608/mygrandmacheatedconstantlyatsnapwheniwasatoddler
AI spacecarp hologram
|
2014-07-14 09:25:37 +01:00 |
|
|
Firecage
|
07a16bbbf7
|
Signed-off-by: Firecage <firecage@hotmail.com>
|
2014-07-14 06:06:04 +02:00 |
|
|
paprka
|
d853909f2b
|
HALT HALT HALT
|
2014-07-13 15:43:32 -07:00 |
|
|
paprka
|
d0f7641bd0
|
syndies use swat helmets too!
|
2014-07-13 14:38:34 -07:00 |
|
|
Firecage
|
4db7359cf6
|
Signed-off-by: Firecage <firecage@hotmail.com>
|
2014-07-13 22:34:44 +02:00 |
|
|
Firecage
|
e13e4ca445
|
Signed-off-by: Firecage <firecage@hotmail.com>
|
2014-07-13 22:32:34 +02:00 |
|
|
Firecage
|
d5a7885842
|
Signed-off-by: Firecage <firecage@hotmail.com>
|
2014-07-13 22:29:37 +02:00 |
|