Commit Graph

1397 Commits

Author SHA1 Message Date
LetterJay 8bd2a0fd03 Update jellypeople.dm 2018-01-24 13:59:02 -06:00
XDTM 3aa246d39b [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common 2018-01-24 13:47:40 -06:00
LetterJay 9544de1693 Merge pull request #5042 from Citadel-Station-13/upstream-merge-34733
[MIRROR] Fixes bot drop & bot assembly issues
2018-01-23 08:23:29 -06:00
oranges 1caf34f0df Merge pull request #34733 from ShizCalev/box-fixes
Fixes bot drop & bot assembly issues
2018-01-23 01:44:09 -06:00
Leo 8bdf83cc72 Merge pull request #34727 from ShizCalev/simpleanimal-godmode
Stops simple_animals from attacking mobs in godmode
2018-01-22 15:46:28 -06:00
deathride58 5aad92cf11 Merge pull request #4948 from Citadel-Station-13/upstream-merge-34590
[MIRROR] Fixes slimepeople not being able to open the bodyswap menu
2018-01-22 20:29:46 +00:00
LetterJay 8fcef30c56 Update jellypeople.dm 2018-01-22 07:36:43 -06:00
deathride58 fadeecaf40 Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667
[MIRROR] Fixes slimes not attacking anybody
2018-01-22 06:25:14 +00:00
LetterJay 1beea71328 Merge pull request #5005 from Citadel-Station-13/upstream-merge-34720
[MIRROR] Syndicate+Pirate mobs now give off light if appropriate
2018-01-21 23:10:57 -06:00
LetterJay 6b998377ca Merge pull request #4996 from Citadel-Station-13/upstream-merge-34686
[MIRROR] Ends the great monkey freezing epidemic
2018-01-21 23:10:00 -06:00
LetterJay 84b9c4bb2b Update life.dm 2018-01-21 23:09:22 -06:00
MMMiracles 372d6505ed make pretty light go light light (#34720) 2018-01-21 21:08:40 -06:00
deathride58 28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
2018-01-21 22:42:53 +00:00
deathride58 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
LetterJay c408f37b4c Update life.dm 2018-01-21 14:21:23 -06:00
LetterJay 6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
LetterJay e02d7ae786 Update life.dm 2018-01-21 14:14:19 -06:00
Tad Hardesty 4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633)
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
ShizCalev 68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
LetterJay 9840a18b5a Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654
[MIRROR] Actually fixes wag emote runtime
2018-01-21 11:49:13 -06:00
LetterJay 7a43017325 Merge pull request #4974 from Citadel-Station-13/upstream-merge-34656
[MIRROR] Fixes missing MakeSlippery() args
2018-01-21 11:48:56 -06:00
LetterJay e3df465eba Merge branch 'master' into upstream-merge-34667 2018-01-21 11:48:51 -06:00
LetterJay 886459dcc3 Merge pull request #4954 from Citadel-Station-13/upstream-merge-34591
[MIRROR] Fixes slimes attacking people with the slime faction
2018-01-21 11:48:07 -06:00
LetterJay 23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133
[MIRROR] Temperature Refactor and Fixes
2018-01-21 11:47:08 -06:00
Robustin e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Jordan Brown b2d7044eb9 Merge pull request #34654 from ShizCalev/tailwag-fix
Actually fixes wag emote runtime
2018-01-20 14:09:58 -06:00
Jordan Brown bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery
Fixes missing MakeSlippery() args
2018-01-20 14:09:49 -06:00
LetterJay 097f2b2ddf Update life.dm 2018-01-20 13:18:25 -06:00
LetterJay a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
XDTM b13be9240c Fixes slimes not attacking anybody 2018-01-19 19:29:52 -06:00
deathride58 ede18e6fec Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598
[MIRROR] Illusions now properly use the health argument of Copy_Parent
2018-01-19 19:39:26 +00:00
deathride58 ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452
[MIRROR] Reduce the volume of the death sound on clock work mobs
2018-01-19 19:36:18 +00:00
deathride58 4aa52b8d99 Update life.dm 2018-01-19 14:32:40 -05:00
Jordan Brown 7b9fda5411 Merge pull request #34591 from XDTM/goodBoy
Fixes slimes attacking people with the slime faction
2018-01-19 09:24:45 -06:00
Jordan Brown aa5e57e3a6 Fixes slimepeople not being able to open the bodyswap menu 2018-01-19 09:17:31 -06:00
Jordan Brown d814497547 Merge pull request #34598 from Robustin/illusion
Illusions now properly use the health argument of Copy_Parent
2018-01-19 09:16:13 -06:00
Trevor Serpas 5d2ddd833a Reduce the volume of the death sound on clock work mobs (#34452)
* Reduce the volume of the death sound on clock work mobs

I edited the .oog since I did not see a way in the code to lower the volume. This will affect all code/game/gamemodes/clock_cult/clock_mobs which at this moment is only maraders and the eminence.

* Non-clockwork mobs are no longer affected

adjusted volume in the code so that the clockwork golems, ratvar, and ratvar plushies are unaffected by the audio file changes
2018-01-19 08:58:29 -06:00
AnturK 3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Robustin 7a16f0a3ef Temperature Refactor and Fixes 2018-01-19 08:41:34 -06:00
LetterJay 9adbe08df8 Merge pull request #4923 from Vivinet/xeno-fix
Temp. Xeno-Hybrid Eye Fix + Normal Leg Addition
2018-01-19 03:21:14 -06:00
Vivinet 18fa25cc17 Temp. Xeno Eye Fix - Leg Addition
Added:
-The option to select eye color for xenos so players selecting this species can blend in the eyes with the head. The eyes weren't originally there but due to upstream changed are now rendered as white, souless eyes.
- Using the lizard normal leg sprites, added the option for the xeno species to use normal legs or digi-grade ones.
2018-01-18 18:20:58 -08:00
deathride58 3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
2018-01-18 06:28:04 +00:00
deathride58 8c743141da Merge pull request #4721 from deathride58/genitalexamine
Exposed genitals will now add details onto examine text
2018-01-18 04:56:50 +00:00
oranges ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
LetterJay 6bcd56a0f3 Merge pull request #4875 from Citadel-Station-13/upstream-merge-34482
[MIRROR] Drone dispensers no longer trap the drones below them forcing ghosts to altclick
2018-01-16 13:50:29 -06:00
F-OS 3608165d7f Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482)
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
2018-01-16 08:45:16 -06:00
kevinz000 da30215a48 Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside. (#34171)
* Flash Refactor

* Update flash.dm

* Update flash.dm
2018-01-16 08:30:36 -06:00
LetterJay 59b5956447 Merge pull request #4826 from deathride58/hopefullyfixesshit
Hopefully fixes human tails/ears not saving, and fixes new/random characters having underwear
2018-01-16 05:03:05 -06:00
oranges c990906791 Merge pull request #34266 from KorPhaeron/goat
Goats eat plant people
2018-01-15 15:54:42 -06:00
coiax c3d0e7d2b5 Xenomorph maids (and Barmaids) clean on move (#34354)
🆑 coiax
add: A xenomorph maid (or barmaid) cleans the floor as they walk on it.
Lie down, and they'll clean your face.
/🆑

- Clearly a massive xenobiology buff by letting them create simple mob
janitors.
- Actually implemented so the Barmaid can clean up the Emergency Escape
Bar, but sure, let's buff the regular maid as well.
2018-01-15 08:01:18 -06:00