Commit Graph

16824 Commits

Author SHA1 Message Date
tigercat2000
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
tigercat2000
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
GunDOSMk1
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
tigercat2000
3ed4b0471e Merge pull request #8455 from Aurorablade/AntagDenied
Borer antag hud check and helper proc
2017-12-23 18:11:01 -08:00
Fox McCloud
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
Fox-McCloud
bd4ecf0bd4 Fixes Various Issues with Giant Spiders 2017-12-07 00:06:10 -05:00
HugoLuman
f72a55dbec Refactors new lung breath code to fix Drask
Allows multiple damage types for lung temperature damage
Fixes #8432

Signed-off-by: HugoLuman <qaggeler@gmail.com>
2017-12-06 00:49:14 -08:00
Crazy Lemon
3bbf29b487 Merge pull request #8292 from Kyep/ability_requirements
NT medical screening for key jobs
2017-12-05 15:25:36 -08:00
Crazy Lemon
c02a561a5a Merge pull request #8283 from Kyep/no_peace
Removes peacekeepers
2017-12-05 15:12:56 -08:00
tigercat2000
ab0cb01768 Fix R_SPAWN exploit w/ JSON serialization 2017-12-04 14:49:11 -08:00
Tayyyyyyy
7f6fb9d369 Fix IPCs vomiting on rotting bodies 2017-12-03 05:57:22 -06:00
tigercat2000
7902c26833 Merge pull request #8359 from uraniummeltdown/airlock
Airlock Code Update + Tweaks
2017-12-02 11:33:23 -08:00
Aurorablade
2346b899d5 Squish 2017-12-02 01:28:40 -05:00
Fox-McCloud
1018d1001b Fixes Slimes Dying on their Own 2017-12-01 23:01:28 -05:00
tigercat2000
48d78b4648 Merge pull request #7832 from Fox-McCloud/lungsss
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
tigercat2000
1c876157b2 Merge pull request #8398 from ExitGame/voxrustle
Adds vox quill rustle emote
2017-11-30 16:07:12 -08:00
tigercat2000
e69f931b78 Merge pull request #8405 from uraniummeltdown/smooth
Diagonal Icon Smoothing
2017-11-30 11:18:02 -08:00
tigercat2000
9692d1357c Merge pull request #8374 from Fox-McCloud/shotguns-OP
Nerfs Shotgun Pellets
2017-11-30 11:08:24 -08:00
uraniummeltdown
658bc95af0 diagonal icon smoothing support
added example diagonal smooth wall
abductor and survival pod walls smooth diagonally
new define for space icon state
fixed abductor walls having no sheet_type
2017-11-29 14:02:13 +04:00
Kyep
1c3b1957cb Fixes merge conflict 2017-11-28 22:39:01 -08:00
tigercat2000
5722fdb593 Merge pull request #8401 from Ty-Omaha/more-logs
Logs Robot Talk
2017-11-27 18:17:08 -08:00
Ty-Omaha
54ae26ee1f logs robot talk 2017-11-27 17:58:56 -05:00
Fox McCloud
18293de33b Merge pull request #8399 from uraniummeltdown/hydrofix
Composting plants/pills transfers all reagents
2017-11-27 06:37:18 -05:00
tigercat2000
e2120714bb Merge pull request #8379 from MarsM0nd/Space_for_tails
Allows the code to show tails when hardsuits are shown
2017-11-26 13:08:27 -08:00
tigercat2000
e923e92694 Merge pull request #8376 from MarsM0nd/suiting_up
Small fixes and improvments for rigsuits
2017-11-26 13:07:38 -08:00
tigercat2000
02615c4e43 Merge pull request #8388 from Fox-McCloud/slime-fix
Fixes Slime Transformation
2017-11-26 13:03:24 -08:00
tigercat2000
b740d5bf28 Merge pull request #8373 from FalseIncarnate/bugfix
Contortionist Jumpsuit fix
2017-11-26 12:50:22 -08:00
tigercat2000
a9d2ab227f Merge pull request #8390 from Aurorablade/WHAT
Ports penguins
2017-11-26 12:38:33 -08:00
tigercat2000
853fe2e73c Merge pull request #8312 from Kyep/ert_borg_fix
Tweaks/Improves ERT borgs
2017-11-26 12:37:55 -08:00
tigercat2000
77810081e7 Merge pull request #8331 from uraniummeltdown/effectfiles
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
2017-11-26 12:35:01 -08:00
Kyep
e5db535056 Tiger requests 2017-11-26 12:28:47 -08:00
tigercat2000
0dfdc8ae2a Merge pull request #8302 from Kyep/better_service_borgs
Buffs Service Borgs
2017-11-26 12:15:25 -08:00
tigercat2000
5035d4ac47 Merge pull request #8378 from Jountax/master
Adds laceup shoes to the loadout menu
2017-11-26 12:14:05 -08:00
tigercat2000
ea3f9ab022 Merge pull request #8323 from Kyep/classified_announce
Stops announcing classified stuff
2017-11-26 12:06:22 -08:00
uraniummeltdown
a5e99cd764 plants no longer take 2x as many cycles to age 2017-11-26 21:07:00 +04:00
uraniummeltdown
6f0921e832 Composting plants/pills transfers all reagents 2017-11-26 20:57:13 +04:00
ExitGame
7444135268 Rustle replaced with quill 2017-11-26 14:17:05 +01:00
ExitGame
c609f64742 Adds vox quill rustle emote 2017-11-26 05:50:26 +01:00
Aurorablade
69ba2710c5 penguins 2017-11-21 02:57:40 -05:00
Kyep
61a2482981 removes emag resistance 2017-11-20 21:57:20 -08:00
Kyep
835c9c9066 Typo fix 2017-11-20 21:48:00 -08:00
Fox-McCloud
0e19a4d00c Fixes Slime Transformation 2017-11-20 12:11:59 -05:00
Fox-McCloud
b1e729e1dd lung specific damage behavior 2017-11-18 19:29:58 -05:00
Fox-McCloud
6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
tigercat2000
89f300918c Merge pull request #8381 from MarsM0nd/ERT_species
No invisible ERT suits
2017-11-18 05:35:04 -08:00