Commit Graph

12118 Commits

Author SHA1 Message Date
Tastyfish
127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
FalseIncarnate
bdd379c5a2 Fixes Anomalies Not Neutralizing
Fixes #4167
2016-04-15 00:12:42 -04:00
TheDZD
5259dc6b1a Merge pull request #4138 from Fox-McCloud/door-sounds
New Airlock Sounds
2016-04-14 22:44:54 -04:00
TheDZD
9fe7fe91f2 Merge pull request #4192 from Fox-McCloud/genetics-fixes-tweaks
Genetics Fixes and Tweaks
2016-04-14 22:25:35 -04:00
Fox-McCloud
efb0bb9d75 remove extras 2016-04-14 20:55:24 -04:00
TheDZD
341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
TheDZD
d95102b007 Merge pull request #4158 from Fox-McCloud/killer-tomato
Killer Tomatoes Live Up to their Name
2016-04-14 19:12:34 -04:00
TheDZD
54919fe78c Merge pull request #4151 from Fox-McCloud/nukies-population
Tweaks Nuke Ops Population Requirement
2016-04-14 19:10:51 -04:00
Fox-McCloud
42c7e41e9a Merge remote-tracking branch 'upstream/master' into dna-injector-refactor 2016-04-14 14:57:00 -04:00
Mieszko Jędrzejczak
4692f3f0a4 Shoots glasses 2016-04-14 20:54:02 +02:00
Fox-McCloud
e6d78c7c60 fix and cancelling 2016-04-14 14:51:25 -04:00
Fox-McCloud
7e4ef50da9 DNA Injector Partial Refactor 2016-04-14 07:49:18 -04: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
cd02ee9a05 remote view nerf 2016-04-13 22:06:06 -04:00
Fox-McCloud
9005622ea7 Genetics Fixes and Tweaks 2016-04-13 21:21:52 -04:00
Fox-McCloud
81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -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
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -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
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
Fox-McCloud
399813b36c Killer Tomatoes Live Up to their Name 2016-04-11 00:12:24 -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
Fox McCloud
b40c369702 Merge pull request #4119 from Aurorablade/VehicleFramework
Ports Tg Simple Vehicle Framework
2016-04-10 20:40:04 -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
Fox-McCloud
012887d29a Tweaks Nuke Ops Population Requirement 2016-04-10 07:47:05 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Fox McCloud
6215646102 Merge pull request #4136 from FalseIncarnate/vendor
Vendor Changes and Minor Fixes
2016-04-10 00:31:31 -04:00
FalseIncarnate
6654767cd2 Burnt match bugfix
Fixes burnt matches being able to light cigs and such.
2016-04-10 00:10:58 -04:00
FalseIncarnate
397d71a3af Vendor Changes
Re-upload without the smoking pipe stuff.
2016-04-10 00:07:37 -04:00
FalseIncarnate
990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
Fox-McCloud
135a83e876 Fixes Monkey Recycler Runtime 2016-04-09 22:55:42 -04:00
Fox-McCloud
86f7732b1a people like weird shit 2016-04-09 22:40:27 -04:00
TheDZD
9ecf552708 Merge pull request #4127 from Fox-McCloud/traitor-vamp
Traitor Vamp
2016-04-09 22:17:15 -04:00
TheDZD
8f635d1a4f Merge pull request #4134 from Fox-McCloud/malf-ai-z-level-change
Malf AI Z-Level Change
2016-04-09 21:59:41 -04:00
Tastyfish
632595ce38 Tweaks 2016-04-09 16:00:59 -04:00
Tastyfish
20f8ca1095 Fixes meals prepared / food eaten scoreboard stats 2016-04-09 02:28:53 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Fox McCloud
ea9489db70 Merge pull request #4115 from tigercat2000/alt_appearances_remmie
Alternate Appearance system
2016-04-08 21:18:25 -04:00
Fox McCloud
9f4058a43e Merge pull request #4142 from Tastyfish/dsodfijas
Fixes cyborg pda messenger
2016-04-08 20:13:33 -04:00
Fox-McCloud
2ec556e994 population adjustments 2016-04-08 20:10:39 -04:00
Tastyfish
b00a8bf95a Fixes cyborg pdas 2016-04-08 15:00:52 -04:00
monster860
e8a9e98113 I dun goofed again 2016-04-08 13:55:32 -04:00
monster860
391e430e3e I dun goofed 2016-04-08 13:54:40 -04:00