Commit Graph
27216 Commits
Author SHA1 Message Date
Kyep 40c1200403 Fixes #6229 - tripwire mines not working 2018-01-01 17:50:32 -08:00
Alffd bb6234c02e Marsmond and Shady changes 2017-12-31 13:35:37 -05:00
Alffd 376f93fe69 Status messages are also modified by colour replace lists. 2017-12-31 13:35:37 -05:00
Alffd 7a25cbb6bd Adjust colors for name overlap 2017-12-31 13:35:37 -05:00
Alffd 379b6621d3 There is no u in color 2017-12-31 13:35:37 -05:00
tigercat2000andGitHub f67a15ec2e Merge pull request #8465 from Kyep/iaa_boost
IAA Retool
2017-12-31 08:35:28 -08:00
tigercat2000andGitHub 6bcc18cd8b Merge pull request #8462 from Fox-McCloud/emp-proof
EMP-Proof Organ Framework
2017-12-31 08:22:04 -08:00
tigercat2000andGitHub 868261b228 Merge pull request #8204 from Vivalas/moar_nerfs
Adds organ cleansing to surgery
2017-12-31 08:19:01 -08:00
tigercat2000andGitHub 67d9501d91 Merge pull request #8075 from Vivalas/master
Assorted security changes
2017-12-31 08:12:13 -08:00
tigercat2000andGitHub 0aa183751e Merge pull request #8493 from Kyep/construction_site
Improves Construction Site
2017-12-31 08:02:22 -08:00
tigercat2000andGitHub 591f718995 Merge pull request #7848 from KasparoVy/splat
Splatter Lands 1 Tile Away in Target Dir & Xeno-blood Splatter Colour Fix
2017-12-31 08:00:14 -08:00
tigercat2000andGitHub f17445b7ff Merge pull request #8486 from Tayyyyyyy/pinpointer_fix
Fix crew pinpointer losing signal when target enters something
2017-12-31 06:48:16 -08:00
tigercat2000andGitHub 05cf07289d Merge pull request #8481 from FreeStylaLT/pill_sprite
Adds a toxic pill sprite, makes the toxin and cyanide pills use it
2017-12-31 06:43:30 -08:00
tigercat2000andGitHub be9e258fd9 Merge pull request #8468 from Aurorablade/SaltInTheEyes
Decouples Darksight from Colorblind
2017-12-31 06:33:49 -08:00
Kyep 1cb0a263b2 Area tweaks, eng outpost airlock 2017-12-30 11:12:05 -08:00
Kyep f4e65fa707 Revamped Construction Site 2017-12-29 23:30:47 -08:00
Tayyyyyyy b1f70c53b5 Make crew pinpointer consistent with crew monitor
Going inside a mech/sleeper/etc will not make you untrackable to the
crew pinpointer.
2017-12-29 13:03:47 -07:00
Aurorablade e862c8ee42 ...i messed up a var name... 2017-12-29 12:22:10 -05:00
FreeStylaLT ebb44a45d2 adds a toxic pill sprite, makes the toxin and cyanide pills use it 2017-12-27 20:42:55 +02:00
Aurorablade c59bc57e14 grey and unathi change revert 2017-12-27 11:51:49 -05:00
tigercat2000andGitHub 2375edf1fd Merge pull request #8422 from Tayyyyyyy/crew_pinpointer
Port /tg/ crew pinpointer
2017-12-27 06:44:11 -08:00
tigercat2000andGitHub 30492b6a1c Merge pull request #8415 from Aurorablade/BugFixes
Wherenin Fethas is actually useful and not making stupid features
2017-12-27 06:22:12 -08:00
tigercat2000andGitHub f15fa789ea Merge pull request #8427 from Aurorablade/Banhammer
Expands Banhammer
2017-12-27 06:21:06 -08:00
Aurorablade c2dca57cb1 indent tweak 2017-12-25 00:50:24 -05:00
VivalasandGitHub 41cb2de4e7 Merge branch 'master' into moar_nerfs 2017-12-24 18:46:33 -06:00
Vivalas 6821cd618e Merge remote-tracking branch 'upstream/master' 2017-12-24 18:13:47 -06:00
Aurorablade 12b78dc449 Add crotch holsters 2017-12-23 23:04:25 -05:00
tigercat2000andGitHub 061632a7f3 Merge pull request #8438 from Fox-McCloud/giant-spider-fix
Fixes Various Issues with Giant Spiders
2017-12-23 19:11:07 -08:00
GunDOSMk1andtigercat2000 3aee4a9da4 Adds Dethamos's fluff (For real this time) (#8450)
* Adds item defines for Denthamos's fluff.

* Adds Denthamos's fluffs suit sprites.

* Adds sprite for Denthamos's fluff ite,

* Fixes Denthamos's Fluff

* Fixes Denthamos's fluff defines.
2017-12-23 18:38:31 -08:00
tigercat2000andGitHub 3ed4b0471e Merge pull request #8455 from Aurorablade/AntagDenied
Borer antag hud check and helper proc
2017-12-23 18:11:01 -08:00
Kyep 9cb2e209d4 alt title: Human Resources Agent 2017-12-22 16:36:49 -08:00
Kyep ba624961b0 new approach: 10h playtime req, extra access 2017-12-22 16:22:47 -08:00
Kyep 23e5fbdd4d makes IAA a karma job 2017-12-22 06:52:54 -08:00
Sam 4531ad4f95 lets maybe not crash on server load 2017-12-21 21:56:18 +00:00
Fox McCloud 1453834db5 EMP-Proof Organ Framework 2017-12-20 00:09:17 -05:00
Fox McCloudandGitHub 12377c7e80 Merge pull request #8400 from uraniummeltdown/hydrocycles
Plants no longer take twice as many cycles to age
2017-12-15 19:13:49 -05:00
HugoLuman e1536129bb Changes umpteen vars back to a list, similar to what simple mobs have for damage coefficients
Signed-off-by: HugoLuman <qaggeler@gmail.com>
2017-12-15 13:20:00 -08:00
HugoLuman c65fa1dd72 Makes it possible to have different modifiers for temperature damage in lungs
Signed-off-by: HugoLuman <qaggeler@gmail.com>
2017-12-15 12:37:34 -08:00
Aurorablade 7f5f4243fc proc tweak and name change 2017-12-14 12:15:33 -05:00
HugoLuman 6dd7fb81cd Makes changes to code suggested by Fox
Cleans up and simplifies a bit

Signed-off-by: HugoLuman <qaggeler@gmail.com>
2017-12-14 00:47:32 -08:00
Aurorablade 27da7b9972 DENIED 2017-12-14 00:38:03 -05:00
KasparoVy dd683fa081 Comment body-bloodying out until it gets fixed.
"So, there's a bit of a bug with the blood system- specifically
bloody_body. It doesn't always transfer the color of the blood
correctly, for no apparent reason." - Tigercat2000
2017-12-13 21:20:19 -05:00
Tayyyyyyy 9ae483758a Add to medivends and remove from brig phys 2017-12-12 01:08:16 -06:00
Aurorablade 782b0d5411 don't stand so close to me.. 2017-12-11 23:33:22 -05:00
Aurorablade 58924dee5b tweaks again 2017-12-07 21:31:53 -05:00
Aurorablade 25fd1858db proper fix 2017-12-07 19:46:48 -05:00
Tayyyyyyy 5d8b45f20e Stay in medbay, CMO 2017-12-07 10:37:44 -06:00
Tayyyyyyy 791ff1a5d3 Give crew pinpointer to blueshield 2017-12-06 23:37:01 -06:00
Aurorablade 63ba838639 spooder runtime revert
fox fixed it better.
2017-12-07 00:23:56 -05:00
Fox-McCloud bd4ecf0bd4 Fixes Various Issues with Giant Spiders 2017-12-07 00:06:10 -05:00