Commit Graph

12118 Commits

Author SHA1 Message Date
Fox-McCloud
f67959b571 cryo computer 2016-01-18 18:55:44 -05:00
Fox-McCloud
f512a00883 Fixes Swarmer Cryopod Eating 2016-01-18 18:17:59 -05:00
Fox McCloud
708d1eca39 Merge pull request #3269 from tigercat2000/back_to_the_beginning
Gibber stuff (and fixing a compile warning *glares at Aurora*)
2016-01-18 18:03:31 -05:00
Fox-McCloud
b4244b3921 Fixes Some Items Attacks 2016-01-18 01:25:10 -05:00
Fox McCloud
5a88ea74f0 Merge pull request #3262 from Tastyfish/wanted-photo
Added printing crew photo from security records
2016-01-17 21:04:29 -05:00
Fox-McCloud
4fe83049fd death alarm sanity 2016-01-17 20:40:12 -05:00
Fox-McCloud
1bd3da4521 Implant Refactor Part II 2016-01-17 20:03:41 -05:00
TheDZD
69f6c178aa Merge pull request #3251 from Fox-McCloud/implant-refactor
TG Implant Refactor/Overhaul
2016-01-17 18:37:50 -05:00
TheDZD
8df530d56e Merge pull request #3258 from Robertha89/patch-1
Increases Nuclear Challenge Time Limit
2016-01-17 17:50:03 -05:00
TheDZD
6db57df0a9 Merge pull request #3271 from Fox-McCloud/access-fix
Fixes Weapon Permit Access
2016-01-17 17:49:15 -05:00
Fox-McCloud
5fa24db081 Fixes Weapon Permit Access 2016-01-17 08:29:24 -05:00
Tigercat2000
92f75423ad Prevent monkies in gibbers (breaks the animation), code styling 2016-01-16 22:03:06 -08:00
Tigercat2000
ebd6877b4a Anyone ever heard of compile-testing? (or viewing the travis log) 2016-01-16 21:36:09 -08:00
Fox-McCloud
0f97120830 Fixes Blueshield Copypaste 2016-01-16 23:25:22 -05:00
TheDZD
b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Fox-McCloud
369ab2cd9c minor fix 2016-01-16 21:36:18 -05:00
Fox-McCloud
ff9acaf730 Merge remote-tracking branch 'upstream/master' into implant-refactor 2016-01-16 20:52:36 -05:00
Fox McCloud
9e55d11fa9 Merge pull request #3178 from Aurorablade/insertlewdcommenthere
try to fix mindslave implant hud
2016-01-16 20:39:57 -05:00
Fox McCloud
fb50b53017 Merge pull request #3246 from Jey123456/altclickdeflate
alt click to deflate inflatable walls / doors.
2016-01-16 19:52:56 -05:00
Fox McCloud
05e2cb95a7 Merge pull request #3242 from Crazylemon64/lesser-changeling
Ports Morph
2016-01-16 19:52:33 -05:00
Fox-McCloud
4558e0e8ae better pad 2016-01-16 19:48:13 -05:00
Tastyfish
60a6f1db52 Added printing photo from security records 2016-01-16 19:35:03 -05:00
Fox McCloud
0ef9700d88 Merge pull request #3236 from Tastyfish/morgue-maintenance
Made Starboard Emergency Storage -> Genetics Maintenance, maint door name parity
2016-01-16 19:08:42 -05:00
Robertha89
bcc65066ee Increases Nuclear Challenge Time Limit 2016-01-16 21:59:52 +01:00
Aurorablade
f40daffbe8 I FIXED IT 2016-01-16 15:50:43 -05:00
Fox-McCloud
8c229280d2 consistency helps 2016-01-16 04:44:56 -05:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Crazylemon64
64c92bf400 Ports Morph
Refactors a bunch of lesser antag mobs into gamemodes/miniantags
2016-01-15 16:31:58 -08:00
Fox McCloud
ad023ae93f Merge pull request #3226 from Crazylemon64/RAEGIN'-MAEGES!!!
Various Ragin' Mages fixes
2016-01-15 16:49:30 -05:00
Fox McCloud
9d4f08385c Merge pull request #3230 from tigercat2000/BUTTS
Adds butts
2016-01-15 16:26:22 -05:00
Jey
189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Tigercat2000
455d885ba3 NanoUI Interface: Fire alarm (ooh fancy) 2016-01-15 10:59:01 -08:00
Jey
6002ec00e1 simple quality of life tweak to the inflatable walls / doors.
Alt-click on an inflated one to deflate (same as the deflate option on right click)
2016-01-15 13:19:18 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Tastyfish
38651c3362 Made Starboard Emergency Storage -> Genetics Maintenance 2016-01-15 00:53:19 -05:00
Tigercat2000
e105450a16 fix hijack too 2016-01-14 14:38:39 -08:00
Tigercat2000
9baf614f82 I hate objectives 2016-01-14 13:55:42 -08:00
Crazy Lemon
1be6911fdd Makes the wizratio more reasonable 2016-01-14 13:54:56 -08:00
Aurorablade
28a2980110 HALP HALP 2016-01-14 14:56:56 -05:00
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
TheDZD
a4c9219dd6 Merge pull request #3220 from Fox-McCloud/startup-fix
Fixes Server Startup Times
2016-01-13 20:00:54 -05:00
Fox-McCloud
8f280b38c8 Fixes Server Startup Times 2016-01-13 19:49:48 -05:00
Fox-McCloud
d1b90257c3 proper typecasting 2016-01-13 15:55:42 -05:00
Fox-McCloud
2541c8f4b6 faster loops 2016-01-13 09:08:53 -05:00
Aurorablade
53222772bc i almost want to give up on this 2016-01-13 03:37:45 -05:00
Fox-McCloud
eb5fcba6c5 Explosion Overhaul 2016-01-12 18:46:10 -05:00
Aurorablade
602d4c1c2f what am i even doing... 2016-01-12 16:22:42 -05:00
Tastyfish
8527933115 Fixed tcomms machines to be deconstructable 2016-01-11 04:08:46 -05:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
TheDZD
7562c07d00 Merge pull request #3174 from Fox-McCloud/tradable-telecrystals
Adds in Tradable Telecrystals
2016-01-10 23:25:30 -05:00