Commit Graph
11561 Commits
Author SHA1 Message Date
deathride58andGitHub 74d918c0b2 Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217
[MIRROR] Fixes FIND_REF_NO_CHECK_TICK not actually disabling world.loop_checks
2018-01-10 19:59:51 +00:00
deathride58andGitHub 94848372e9 Merge pull request #4741 from Citadel-Station-13/upstream-merge-34214
[MIRROR]  Retcons spacemen movement lore in sillytips.txt
2018-01-10 19:59:31 +00:00
deathride58andGitHub 5abe6abad6 Merge pull request #4740 from Citadel-Station-13/upstream-merge-34209
[MIRROR] Fixes missing defib inhands
2018-01-10 19:58:57 +00:00
CitadelStationBot 540fccc748 Automatic changelog generation for PR #4739 [ci skip] 2018-01-10 13:58:38 -06:00
deathride58andGitHub f24bf9f9fd Merge pull request #4739 from Citadel-Station-13/upstream-merge-34139
[MIRROR] Fixes archdevils creating wall girders when trying to destroy walls.
2018-01-10 19:58:36 +00:00
CitadelStationBot e96a67a058 Automatic changelog generation for PR #4738 [ci skip] 2018-01-10 13:58:21 -06:00
deathride58andGitHub 54c87fdd15 Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111
[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
2018-01-10 19:58:18 +00:00
deathride58andGitHub 400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096
[MIRROR] Cult will actually report victories now
2018-01-10 19:57:56 +00:00
deathride58andGitHub df199bc940 Merge pull request #4736 from Citadel-Station-13/upstream-merge-34160
[MIRROR] Fixes non-cultist hulks being able to hold cult bbs
2018-01-10 19:57:35 +00:00
deathride58andGitHub d0cf5368b9 Merge pull request #4735 from Citadel-Station-13/upstream-merge-34194
[MIRROR] Makes the tag warning a stack_trace
2018-01-10 19:57:16 +00:00
deathride58andGitHub 14d0857109 Merge pull request #4733 from Citadel-Station-13/upstream-merge-34187
[MIRROR] Switches butchering/gib drops to use drop_location
2018-01-10 19:56:54 +00:00
deathride58andGitHub f00252540b Merge pull request #4732 from Citadel-Station-13/upstream-merge-34185
[MIRROR] Fixes feedback spell level var
2018-01-10 19:56:30 +00:00
deathride58andGitHub d0e170d9f9 Merge pull request #4731 from Citadel-Station-13/upstream-merge-34169
[MIRROR] Fixes fully_heal not curing disabilities
2018-01-10 19:56:13 +00:00
deathride58andGitHub 2ee5252a62 Merge pull request #4730 from Citadel-Station-13/upstream-merge-34170
[MIRROR] Fixes non-holy mobs purifying BBS
2018-01-10 19:55:35 +00:00
CitadelStationBot da47927255 Automatic changelog generation for PR #4728 [ci skip] 2018-01-10 13:50:35 -06:00
deathride58andGitHub 7c576c7d32 Merge pull request #4728 from Citadel-Station-13/upstream-merge-33933
[MIRROR] Late joiners also get summoned guns/magic
2018-01-10 19:50:33 +00:00
deathride58andGitHub 5597c55064 Merge pull request #4722 from Citadel-Station-13/upstream-merge-34110
[MIRROR] shadowshroom nerf reverted
2018-01-10 19:48:53 +00:00
deathride58andGitHub d81e3b742f Merge pull request #4726 from Citadel-Station-13/upstream-merge-34201
[MIRROR] Fixes BUILD_TESTING logic being inverted
2018-01-10 19:48:21 +00:00
deathride58andGitHub ea9c6eb490 Merge pull request #4725 from Citadel-Station-13/upstream-merge-34197
[MIRROR] Unsets cache_lifespan
2018-01-10 19:48:03 +00:00
deathride58andGitHub 1e9edac90f Merge pull request #4734 from Citadel-Station-13/upstream-merge-34195
[MIRROR] Fixes weakref runtimes
2018-01-10 19:47:28 +00:00
CitadelStationBot 36b7e51b69 Fixes FIND_REF_NO_CHECK_TICK not actually disabling world.loop_checks 2018-01-10 09:45:52 -06:00
Jordan BrownandCitadelStationBot 7c7ecf1118 Fixes FIND_REF_NO_CHECK_TICK not actually disabling world.loop_checks (#34217) 2018-01-10 09:45:51 -06:00
CitadelStationBot 5c4a22c60c Retcons spacemen movement lore in sillytips.txt 2018-01-10 09:04:57 -06:00
Dax DupontandCitadelStationBot fe7ccaa300 Retcons spacemen movement lore in sillytips.txt 2018-01-10 09:04:57 -06:00
CitadelStationBot 4423aed5aa Fixes missing defib inhands 2018-01-10 06:55:23 -06:00
LeoandCitadelStationBot c39de1e7ed Merge pull request #34209 from ShizCalev/defib-icon-fixes
Fixes missing defib inhands
2018-01-10 06:55:23 -06:00
CitadelStationBot 96a8b4da49 Fixes archdevils creating wall girders when trying to destroy walls. 2018-01-10 03:51:23 -06:00
GoodstuffandCitadelStationBot bc543c5220 Update twohanded.dm (#34139) 2018-01-10 03:51:23 -06:00
CitadelStationBot 8ea39a60cd Fixes buckled message spam for ghosts inside talking scythes 2018-01-10 03:48:10 -06:00
ShizCalevandCitadelStationBot 594de23c1f Fixes buckled message spam for ghosts inside talking scythes (#34111)
* Fixes buckled message spam for ghosts

* params
2018-01-10 03:48:10 -06:00
CitadelStationBot 46ef4f319f Cult will actually report victories now 2018-01-10 03:46:55 -06:00
RobustinandCitadelStationBot 1bd84a8f6b Cult will actually report victories now (#34096)
* Cult victory fix

* Update cult.dm

* Correct cult victory report
2018-01-10 03:46:55 -06:00
CitadelStationBot 6db2902156 Fixes non-cultist hulks being able to hold cult bbs 2018-01-10 03:13:02 -06:00
Jordan BrownandCitadelStationBot cb3506f319 Merge pull request #34160 from ShizCalev/cult-blade-drop
Fixes non-cultist hulks being able to hold cult bbs
2018-01-10 03:13:02 -06:00
CitadelStationBot 6284ffe976 Makes the tag warning a stack_trace 2018-01-10 03:12:54 -06:00
LeoandCitadelStationBot 805442ee51 Merge pull request #34194 from ninjanomnom/tag-stack
Makes the tag warning a stack_trace
2018-01-10 03:12:54 -06:00
CitadelStationBot bbf402f6f4 Fixes weakref runtimes 2018-01-10 03:12:47 -06:00
LeoandCitadelStationBot 88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1
Fixes weakref runtimes
2018-01-10 03:12:46 -06:00
CitadelStationBot 59ca1713b2 Switches butchering/gib drops to use drop_location 2018-01-10 03:12:39 -06:00
LeoandCitadelStationBot 5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
2018-01-10 03:12:39 -06:00
CitadelStationBot cb6c5f2ca4 Fixes feedback spell level var 2018-01-10 03:12:31 -06:00
LeoandCitadelStationBot 56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs
Fixes feedback spell level var
2018-01-10 03:12:31 -06:00
CitadelStationBot 7052510165 Fixes fully_heal not curing disabilities 2018-01-10 03:12:23 -06:00
LeoandCitadelStationBot 377ea0f68c Merge pull request #34169 from ShizCalev/heal-fix
Fixes fully_heal not curing disabilities
2018-01-10 03:12:23 -06:00
CitadelStationBot db5d540fac Fixes non-holy mobs purifying BBS 2018-01-10 03:12:16 -06:00
LeoandCitadelStationBot d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy
Fixes non-holy mobs purifying BBS
2018-01-10 03:12:16 -06:00
CitadelStationBot e42a819000 Late joiners also get summoned guns/magic 2018-01-10 03:11:56 -06:00
orangesandCitadelStationBot 3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining
Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
CitadelStationBot dc13dc2d76 Fixes BUILD_TESTING logic being inverted 2018-01-10 03:11:40 -06:00
Jordan BrownandCitadelStationBot 32052fd06f Fixes BUILD_TESTING logic being inverted (#34201) 2018-01-10 03:11:40 -06:00