Commit Graph

27324 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak
4692f3f0a4 Shoots glasses 2016-04-14 20:54:02 +02:00
Mieszko Jędrzejczak
6b72a889e6 Shot glasses 2016-04-14 20:53:47 +02:00
Fox McCloud
ad126c11f9 Merge pull request #4200 from VampyrBytes/FixesDNAModifier
Fixes DNA Modifier using refs instead of copies
2016-04-14 06:26:35 -04:00
VampyrBytes
049b5165c5 Fixes DNA Modifier using refs instead of copies
fixes #4193

Transfer button and block injectors now make copies instead of using
references
2016-04-14 10:55:55 +01:00
Fox McCloud
aba949cc19 Merge pull request #4184 from Crazylemon64/re-add_mapmerge_instructions
Re-adds the mapmerge instructions
2016-04-14 02:16:03 -04:00
ParadiseSS13-Bot
2f6274106c Automatic changelog generation for PR #4190 2016-04-13 16:24:59 -04:00
TheDZD
b0fd688ed5 Merge pull request #4190 from Meisaka/fix-law
Fix Malf Law in Law manager
2016-04-13 16:24:57 -04:00
ParadiseSS13-Bot
f259ae0437 Automatic changelog generation for PR #4174 2016-04-13 16:23:06 -04:00
TheDZD
7e30d13c06 Merge pull request #4174 from Fox-McCloud/blind-fix
Fixes Blind Player Preference Doing Nothing
2016-04-13 16:23:04 -04:00
Meisaka Yukara
80b8aee935 Replace format code 2016-04-14 03:21:23 +09:00
Fox McCloud
1d030c5824 Merge pull request #4182 from pinatacolada/rolldown
Fixes #4181
2016-04-12 20:14:30 -04:00
Fox McCloud
edd86723e2 Merge pull request #4186 from LittleBigKid2000/forrealthistimeforreal
Removes the mysterious door to space in the prisoner shuttle dock: For Real This Time Edition
2016-04-12 19:30:08 -04:00
Isaac Erwin
2abefd278c Removes the mysterious door to space in the prisoner shuttle dock
Now with 100% more mapmerge
2016-04-12 16:13:18 -04:00
Crazylemon64
014ddc3108 Renames instruction file, removes obsolete mapmerge driver bit 2016-04-12 10:37:14 -07:00
Crazylemon64
894cc7b8d4 Sure, it took all of 5 minutes 2016-04-12 10:16:33 -07:00
pinatacolada
b9b0b3d58f Fixes #4181 2016-04-12 16:06:27 +01:00
Fox McCloud
d68f93cabc Merge pull request #4180 from Aurorablade/xenobio
Removes Xenobio
2016-04-12 07:56:13 -04:00
Aurorablade
a333496770 Removes Xenobio 2016-04-12 07:42:22 -04:00
ParadiseSS13-Bot
528492e87e Automatic changelog generation for PR #4146 2016-04-12 03:29:26 -04:00
Fox McCloud
d5c95892f6 Merge pull request #4146 from Aurorablade/Stupideyes
I HATE EYEBALLS
2016-04-12 03:29:24 -04:00
Fox McCloud
f923c3d4ff Merge pull request #4153 from pinatacolada/sop-books
Adds SOP books
2016-04-12 03:29:03 -04:00
Fox McCloud
dfd5ad7eb9 Merge pull request #4159 from optimumtact/bleepbooptravisisstricter
Make dm.sh fail on DM warnings
2016-04-12 03:27:25 -04:00
Fox McCloud
1097f66ecb Merge pull request #4165 from Tastyfish/sdql-update
More SDQL Insanity
2016-04-12 03:27:11 -04:00
Fox-McCloud
e1d057ab0e Fixes Blind Player Preference Doing Nothing 2016-04-12 03:21:39 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
ParadiseSS13-Bot
fedfaab182 Automatic changelog generation for PR #4150 2016-04-11 19:41:24 -04:00
Fox McCloud
dab1303d46 Merge pull request #4150 from Tastyfish/away-reorder
Updates maploader code to be in line with tg's, startup improvements
2016-04-11 19:41:22 -04:00
Fox McCloud
f4df310f1d Merge pull request #4166 from Tastyfish/mulehouse
Fixes MULEs not coming out of their shell.
2016-04-11 19:29:04 -04:00
Fox McCloud
62b57d4cbf Merge pull request #4155 from Tastyfish/bruh
Makes cans crushable by humans and janiborgs
2016-04-11 18:44:17 -04:00
Fox McCloud
e9ef1eb162 Merge pull request #4171 from Tastyfish/girder-identity-crisis
Fixes girder animal smash messages
2016-04-11 18:42:55 -04:00
Tastyfish
a298ca044a Fixes function call with lists 2016-04-11 16:29:20 -04:00
Tastyfish
68b936f0e1 Fixes girder animal smash messages 2016-04-11 13:51:31 -04:00
pinatacolada
b30b826e21 forgot legal and standard sop oops 2016-04-11 16:10:05 +01:00
Tastyfish
5f87411850 Fixes MULEs not coming out of their shell. 2016-04-11 04:17:32 -04:00
Tastyfish
59097a99ea Allows update to set to vars of vars, call procs in arbitrary expressions,
procs of vars
2016-04-11 03:00:21 -04:00
oranges
32a8bf0ddf Make dm.sh fail on DM warnings
Thereby making travis fail if a warning is emitted when building
2016-04-11 16:21:19 +12:00
Aurorablade
3dcb3dfb3c lemons suggestions...kind of... 2016-04-10 22:25:52 -04:00
TheDZD
6404a5ee97 Merge pull request #4149 from Fox-McCloud/monkey-runtime
Fixes Monkey Recycler Runtime
2016-04-10 20:43:21 -04:00
ParadiseSS13-Bot
8e01c0d5db Automatic changelog generation for PR #4119 2016-04-10 20:40:07 -04:00
Fox McCloud
b40c369702 Merge pull request #4119 from Aurorablade/VehicleFramework
Ports Tg Simple Vehicle Framework
2016-04-10 20:40:04 -04:00
pinatacolada
fd1367156b remove step 2016-04-10 22:48:01 +01:00
Tastyfish
ccbe2ca904 Makes cans crushable by humans and janiborgs 2016-04-10 17:20:09 -04:00
pinatacolada
b75bc658db typo 2016-04-10 21:44:31 +01:00
pinatacolada
06d7c325ea thought i had this fixed 2016-04-10 21:21:27 +01:00
pinatacolada
b5768f485c Adds SOP books
Adds SOP books to the corresponding departments and department head's
offices. Rep and IAA have a brand spanking new shelf with all the SOP
books.

Also right now it's using generic book sprites because I couldn't sprite
even if my life depended on it, maybe someone could sprite something
nice for them?

Also fixed a random < that was just kinda there out in nowhere in an
atmos book
2016-04-10 21:16:29 +01:00
Aurorablade
dc16cfc49b no, no. i clean. 2016-04-10 07:26:24 -04:00
Tastyfish
47d432a278 oops 2016-04-10 03:02:43 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Aurorablade
8be42cd15b vehicles now respect lube and bullets 2016-04-10 01:03:23 -04:00
ParadiseSS13-Bot
1b8711171a Automatic changelog generation for PR #4136 2016-04-10 00:31:33 -04:00