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
5751c601f2
Merge pull request #4939 from Citadel-Station-13/upstream-merge-34627
...
[MIRROR] Fixes pie runtime
2018-01-19 19:36:35 +00:00
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
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
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
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
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
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
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
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
495bbb0101
Merge pull request #34626 from ShizCalev/borg-recharge-runtime
...
Fixes borg cell recharging runtime
2018-01-19 09:00:50 -06:00
93cc10b7a0
Merge pull request #34627 from ShizCalev/pie-runtime
...
Fixes pie runtime
2018-01-19 08:58:37 -06:00
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
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
363effb98f
Merge pull request #34639 from DaxDupont/succ-less-power
...
Fixes autolathe power consumption
2018-01-19 08:52:49 -06:00
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
7f34b90e7c
Merge pull request #34573 from AnturK/slidethis
...
Fixes the diagonal sliding
2018-01-19 08:50:28 -06:00
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
f3627b8428
Merge pull request #34331 from Shadowlight213/expplayervisibility
...
Players can now see their own tracked playtime
2018-01-19 08:45:02 -06:00
3dc89ba058
Antag Panel / Check antagonists Refactor
2018-01-19 08:43:49 -06:00
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
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
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
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
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
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
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
757dfbbdc5
Ports Aurora's floor tile color turf decals (For mappers) ( #34492 )
...
* ports Aurora's floor tile color decals
* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile
* corner > tile decal
2018-01-18 21:28:14 -06:00
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
f93ca08aa7
Fixes irreparable plating ( #34472 )
2018-01-18 20:13:25 -06:00
c545dc2f79
Merge pull request #4919 from Citadel-Station-13/upstream-merge-34563
...
[MIRROR] Regens icons on clean_act if item is loc'd on a mob
2018-01-19 00:33:07 +00:00
d54dae8ddf
Merge pull request #4918 from Citadel-Station-13/upstream-merge-34552
...
[MIRROR] All crew can purify the Blood Bastard Sword (again)
2018-01-19 00:32:50 +00:00
ca9ce2058e
Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529
...
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
2018-01-19 00:32:26 +00:00
61ccb255c4
Merge pull request #4915 from Citadel-Station-13/upstream-merge-34438
...
[MIRROR] Mass hallucinations now gives the same hallucination to everyone
2018-01-19 00:32:11 +00:00
6f312b9d5c
Merge pull request #4912 from Citadel-Station-13/upstream-merge-34553
...
[MIRROR] Fixes being able to place abstract items in fridges & chem dispensers
2018-01-18 23:06:41 +00:00
553ccd5597
Merge pull request #4911 from Citadel-Station-13/upstream-merge-34558
...
[MIRROR] Log PDA messages sent by the message monitor console
2018-01-18 23:06:19 +00:00
ed9428e29b
Merge pull request #34563 from ShizCalev/clean-icon
...
Regens icons on clean_act if item is loc'd on a mob
2018-01-18 17:00:49 -06:00
66bc684184
Merge pull request #34552 from Robustin/revert3
...
All crew can purify the Blood Bastard Sword (again)
2018-01-18 16:59:39 -06:00
a38dc60466
Merge pull request #34529 from Xhuis/nullroddesc
...
changes the null rod's description to reflect its use against clockwork cults
2018-01-18 16:56:26 -06:00
05d87d54a3
Merge pull request #34438 from XDTM/EqualHallucinations
...
Mass hallucinations now gives the same hallucination to everyone
2018-01-18 16:52:03 -06:00
594e8c8e6d
Merge pull request #34553 from ShizCalev/abstract-transfertoloc
...
Fixes being able to place abstract items in fridges & chem dispensers
2018-01-18 16:48:32 -06:00
08809072bb
Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs
...
Log PDA messages sent by the message monitor console
2018-01-18 16:48:25 -06:00
f2c5a8ae2a
Spellcheck: Fixed a typo on holy_weapons.dm ( #34561 )
2018-01-18 16:46:13 -06:00
91299a6152
Merge pull request #4838 from deathride58/loadoutsystem
...
[READY FOR TESTMERGE] Ports Hippie's loadout system
2018-01-18 15:32:00 -06:00
c2f8339135
Adds a Recipe for morphine to medicine ( #34541 )
...
* Adds a Recipe for morphine to medicine
Exactly what it says on the tin.
* Ketrazine
Adds ketrazine, a combat stimulant with severe consequences for use.
* Revert "Ketrazine"
This reverts commit d618fe337cc28f5513c59ff3399894c10dde4a7d.
2018-01-18 15:07:13 -06:00
0d6d7116ff
Merge pull request #34533 from Buggy123/patch-56
...
Fixes integrity value for non-reinforced plasma window
2018-01-18 06:11:01 -06:00
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
4f058dbf6c
Merge pull request #4906 from deathride58/mapseparation2
...
Map syncs + ATTEMPT 2 OF MODIFIED MAP SEPARATION
2018-01-18 00:03:32 -06:00
9bf498c763
Merge pull request #4903 from Citadel-Station-13/upstream-merge-34291
...
[MIRROR] Removes sulpheric acid requirement from most computer boards
2018-01-18 04:59:08 +00:00
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
deathride58