Commit Graph

9031 Commits

Author SHA1 Message Date
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 ea45eb72ef Merge pull request #4937 from Citadel-Station-13/upstream-merge-34634
[MIRROR] fix/spellcheck: Changes command error on cqc.dm
2018-01-19 19:36:02 +00:00
deathride58 8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639
[MIRROR] Fixes autolathe power consumption
2018-01-19 19:35:12 +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 82353abaa6 Merge pull request #4933 from Citadel-Station-13/upstream-merge-34573
[MIRROR] Fixes the diagonal sliding
2018-01-19 19:34:31 +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 7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction
Corrects tile color defines
2018-01-19 12:24:00 -06:00
Ashe Higgs c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504)
* lets you cancel cc warps

* runtimestation
2018-01-19 09:57:57 -06:00
kevinz000 b7df40727d You can now buckle people to target stakes (#34514)
* Update target_stake.dm

* Update target_stake.dm

* Update target_stake.dm
2018-01-19 09:52:42 -06:00
Jordan Brown 5e58abca3a Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest
fixes supply drop pods being impossible to dissassemble
2018-01-19 09:43:21 -06: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
Jordan Brown e963853a89 Adds byond versions to feedback (#34616) 2018-01-19 09:24:36 -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
Jordan Brown bcfbe4d14a Merge pull request #34513 from optimumtact/hostwiththemost
Move roundid and schema check to dbcore subsystem
2018-01-19 09:18:52 -06:00
Jordan Brown 0657373821 Makes fire priority values defines 2018-01-19 09:18:44 -06:00
Jordan Brown aa5e57e3a6 Fixes slimepeople not being able to open the bodyswap menu 2018-01-19 09:17:31 -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 3cb5b20709 Merge pull request #34601 from KorPhaeron/bomb
TTVs are too big to fit in bags
2018-01-19 09:12:45 -06:00
Jordan Brown f706605227 Low memory mode 2018-01-19 09:12:37 -06:00
Jordan Brown 1b40c727b9 Merge pull request #34608 from ninjanomnom/kevin-is-terrible
Fixes some dumb code in the jousting component
2018-01-19 09:04:15 -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
ThePainkiller 90947a50ad fix/spellcheck: Changes command error on cqc.dm (#34634)
* Update holy_weapons.dm

* Update cqc.dm
2018-01-19 08:57:18 -06:00
Jordan Brown 363effb98f Merge pull request #34639 from DaxDupont/succ-less-power
Fixes autolathe power consumption
2018-01-19 08:52:49 -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 7f34b90e7c Merge pull request #34573 from AnturK/slidethis
Fixes the diagonal sliding
2018-01-19 08:50:28 -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
deathride58 19fa1066d9 Update AI_modules.dm 2018-01-19 08:48:40 -05:00
deathride58 844a80dba6 Update title.dm 2018-01-19 08:48:09 -05:00
deathride58 7b5b354e9d Update ticker.dm 2018-01-19 08:47:49 -05:00
deathride58 cf538efeb7 Update credits.dm 2018-01-19 08:47:27 -05: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 379fdb613e Merge pull request #4925 from Citadel-Station-13/upstream-merge-34492
[MIRROR] Ports Aurora's floor tile color turf decals (For mappers)
2018-01-19 02:52:21 -06:00