Commit Graph

4620 Commits

Author SHA1 Message Date
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
LetterJay 26fb702233 Merge pull request #4972 from Citadel-Station-13/upstream-merge-34649
[MIRROR] Fixes spider reagents typo
2018-01-20 13:17:35 -06:00
LetterJay 5f7cc68e40 Merge pull request #4970 from Citadel-Station-13/upstream-merge-34595
[MIRROR] Cargotechs now spawn with Export Scanners
2018-01-20 13:16:07 -06:00
LetterJay a8055123b6 Merge pull request #4969 from Citadel-Station-13/upstream-merge-34605
[MIRROR] Fixes some kinetic accelerator runtimes
2018-01-20 13:15:53 -06:00
LetterJay a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
Jordan Brown 0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo
Fixes spider reagents typo
2018-01-20 09:48:44 -06:00
MrDoomBringer 449c7d79df Cargotechs now spawn with Export Scanners (#34595)
* excessiveuseof[b]obblestone

* whups

* praisenarsie
2018-01-19 22:32:17 -06:00
Leo 945358fbfd Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes
Fixes some kinetic accelerator runtimes
2018-01-19 19:47:21 -06:00
deathride58 28147de16a Merge pull request #4960 from Citadel-Station-13/upstream-merge-34501
[MIRROR] Allow mapping non-default scrubbers
2018-01-19 19:44:00 +00:00
deathride58 4077ec6713 Merge pull request #4957 from Citadel-Station-13/upstream-merge-34641
[MIRROR] Fixes conveyor belt power usage.
2018-01-19 19:43:33 +00:00
deathride58 26bca66519 Merge pull request #4956 from Citadel-Station-13/upstream-merge-34547
[MIRROR] Jaunt Direction Fix
2018-01-19 19:43:14 +00:00
deathride58 2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574
[MIRROR] Added observer verb View Gases
2018-01-19 19:42:18 +00:00
deathride58 78d31edc6c Merge pull request #4947 from Citadel-Station-13/upstream-merge-34557
[MIRROR] Fixes cancelling equipment selection being equivalent to selecting "Naked"
2018-01-19 19:39:42 +00: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 29099c3608 Merge pull request #4945 from Citadel-Station-13/upstream-merge-34569
[MIRROR] Fixes bananium ore sprite
2018-01-19 19:39:07 +00:00
deathride58 947b87ec0c Merge pull request #4941 from Citadel-Station-13/upstream-merge-34609
[MIRROR] removed an extra checktick that could cause issues in shuttles
2018-01-19 19:37:01 +00:00
deathride58 98cc937b40 Merge pull request #4940 from Citadel-Station-13/upstream-merge-34626
[MIRROR] Fixes borg cell recharging runtime
2018-01-19 19:36:47 +00:00
deathride58 5751c601f2 Merge pull request #4939 from Citadel-Station-13/upstream-merge-34627
[MIRROR] Fixes pie runtime
2018-01-19 19:36:35 +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 8872f801f1 Merge pull request #4934 from Citadel-Station-13/upstream-merge-34637
[MIRROR] Fixes empty IC syringe having 0 transfer amount
2018-01-19 19:34:49 +00:00
deathride58 4c5e78c7f8 Merge pull request #4932 from Citadel-Station-13/upstream-merge-34576
[MIRROR] Removes teleport beacon from Free Golem Ship
2018-01-19 19:34:12 +00:00
deathride58 3514629c77 Merge pull request #4931 from Citadel-Station-13/upstream-merge-34331
[MIRROR] Players can now see their own tracked playtime
2018-01-19 19:33:50 +00:00
deathride58 e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236
[MIRROR] Antag Panel / Check antagonists Refactor
2018-01-19 19:33:25 +00:00
deathride58 4aa52b8d99 Update life.dm 2018-01-19 14:32:40 -05:00
Jordan Brown f0b02fac56 Merge pull request #34501 from AutomaticFrenzy/patch/mapping-scrubbers
Allow mapping non-default scrubbers
2018-01-19 09:38:04 -06:00
Jordan Brown 0c9adb1ef6 Merge pull request #34641 from DaxDupont/belt-power
Fixes conveyor belt power usage.
2018-01-19 09:30:23 -06:00
uraniummeltdown 7f5f255ce7 jaunting wraiths should now always be facing the correct direction in their animation and sprite before and after jaunt (#34547) 2018-01-19 09:29:10 -06: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
Buggy123 57c829a2aa Added observer verb View Gases (#34574)
* Added observer verb View Gases

* Fixed atmospheric report plurality correctness

* Changed mole/s to mol.
2018-01-19 09:23:22 -06:00
deathride58 49a5a5cddc Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557)
* nerfs butterfingers, throws in bonus preorder exclusive cancel button

* Update debug.dm
2018-01-19 09:16:22 -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
Jordan Brown 7fd72d38fa Merge pull request #34569 from ShizCalev/this-shit-is-bananas
Fixes bananium ore sprite
2018-01-19 09:13:56 -06:00
Jordan Brown 3bc7163a8f Merge pull request #34609 from ninjanomnom/leftover-checktick
removed an extra checktick that could cause issues in shuttles
2018-01-19 09:04:06 -06:00
Jordan Brown 495bbb0101 Merge pull request #34626 from ShizCalev/borg-recharge-runtime
Fixes borg cell recharging runtime
2018-01-19 09:00:50 -06:00
Jordan Brown 93cc10b7a0 Merge pull request #34627 from ShizCalev/pie-runtime
Fixes pie runtime
2018-01-19 08:58:37 -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
Jordan Brown 1639495adb Merge pull request #34637 from yorii/patch-1
Fixes empty IC syringe having 0 transfer amount
2018-01-19 08:52:41 -06:00
Jordan Brown 95b6959190 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship
Removes teleport beacon from Free Golem Ship
2018-01-19 08:50:20 -06:00
Jordan Brown f3627b8428 Merge pull request #34331 from Shadowlight213/expplayervisibility
Players can now see their own tracked playtime
2018-01-19 08:45:02 -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
AnturK 6354c6eec5 Moves creating tag before intialization (#34512)
* Moves creating tag before intialization

* Two nukes for price of one.

* coord
2018-01-19 08:41:24 -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
LetterJay caa0d29bc8 Merge pull request #4926 from Citadel-Station-13/upstream-merge-34213
[MIRROR] [ready] Adds a system to get a stack trace as a list.
2018-01-19 02:52:29 -06:00
LetterJay cd178d9756 Merge pull request #4921 from Citadel-Station-13/upstream-merge-34472
[MIRROR] Fixes irreparable plating, deprecates broken & burnt vars on maps
2018-01-19 02:51:51 -06:00
LetterJay 6981bcfab2 Merge pull request #4909 from Citadel-Station-13/upstream-merge-34541
[MIRROR] Adds a Recipe for morphine to medicine
2018-01-19 02:49:12 -06:00
Jordan Brown 9478478ca1 Merge pull request #34213 from MrStonedOne/gibstacktrace
[ready] Adds a system to get a stack trace as a list.
2018-01-18 22:45:39 -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
ShizCalev f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00