shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

9021 Commits

Author SHA1 Message Date
Jordan Brown 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
Leo 805442ee51 Merge pull request #34194 from ninjanomnom/tag-stack 
Makes the tag warning a stack_trace
 2018-01-10 03:12:54 -06:00
Leo 88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1 
Fixes weakref runtimes
 2018-01-10 03:12:46 -06:00
Leo 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
Leo 56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs 
Fixes feedback spell level var
 2018-01-10 03:12:31 -06:00
Leo 377ea0f68c Merge pull request #34169 from ShizCalev/heal-fix 
Fixes fully_heal not curing disabilities
 2018-01-10 03:12:23 -06:00
Leo d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy 
Fixes non-holy mobs purifying BBS
 2018-01-10 03:12:16 -06:00
oranges 1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
oranges 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
Robustin 34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
Jordan Brown 57b2235d22 Unsets cache_lifespan (#34197) 2018-01-10 03:11:30 -06:00
deathride58 34297d5005 fixes setting flavortext in preferences. hopefully 2018-01-09 23:11:22 -05:00
deathride58 78df6facb6 fixes flavortext readmores for real this time 2018-01-09 22:59:22 -05:00
AnturK f6ef771ccd Fixes teleport camera (#34113) 2018-01-08 22:09:14 -06:00
deathride58 9fd87720ae Reduces detail in some genital descriptions, makes breasts only leak when aroused 2018-01-08 21:52:06 -05:00
oranges 3671228196 Merge pull request #34110 from Armhulen/patch-40 
shadowshroom nerf reverted
 2018-01-08 20:07:57 -06:00
deathride58 b3ff238cb8 you can now examine people with exposed genitals to see details 2018-01-08 20:45:08 -05:00
deathride58 9337c29450 who will win: a thousand yiffy snowflakes, or 1 misplaced \" 2018-01-08 18:24:47 -05:00
deathride58 b35911b02c Update cleanbot.dm 2018-01-08 16:42:18 -05:00
deathride58 f606ed9e53 Merge pull request #4713 from Citadel-Station-13/upstream-merge-34105 
[MIRROR] Clean up a bunch of undefined arg runtimes
 2018-01-08 20:52:24 +00:00
deathride58 ed2cf5e164 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into theprthatbulliesjanitormains 2018-01-08 15:44:05 -05:00
deathride58 ecaf3546f1 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34105 2018-01-08 15:35:45 -05:00
deathride58 5bdbd5a771 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34067 2018-01-08 15:34:27 -05:00
deathride58 ca4c2da248 Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074 
[MIRROR] Updates test areas debug command
 2018-01-08 20:04:28 +00:00
deathride58 b99f13f1bc Merge pull request #4717 from Citadel-Station-13/upstream-merge-33768 
[MIRROR] Fixes vitality matrices giving massively more vitality than they should
 2018-01-08 20:04:08 +00:00
deathride58 6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
deathride58 d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
ShizCalev f54854bca8 Updates test areas debug command (#34074) 
* Sanity check for test areas debug command

* Shifted to popup window
 2018-01-08 04:39:09 -06:00
Ashe Higgs 15f961958e Fixes vitality matrices giving massively more vitality than they should (#33768) 
* Fixes vitality matrix shenanigans

* Replaces the spawn_dust() with a variable check

* Update clock_sigils.dm
 2018-01-08 03:51:10 -06:00
deathride58 e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58 39614f685e Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100 
[MIRROR] Adds spaceturf check to blob overmind spawning
 2018-01-08 06:17:23 +00:00
deathride58 e39ae49a2e !!experimental!! fix for flavortext readmore 2018-01-08 01:15:40 -05:00
deathride58 7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58 c2eed848dd Merge pull request #4696 from Citadel-Station-13/upstream-merge-34150 
[MIRROR] Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire
 2018-01-08 04:42:28 +00:00
deathride58 c977193db0 Merge pull request #4715 from Citadel-Station-13/upstream-merge-34058 
[MIRROR] Fixes component forensics deleting old instead of new component.
 2018-01-08 04:20:43 +00:00
deathride58 6b27e322b8 Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125 
[MIRROR] Makes the chaplain's soulshard require death
 2018-01-08 04:19:45 +00:00
deathride58 6bb49b1332 Update say.dm 2018-01-07 23:19:11 -05:00
deathride58 9decb2e2b2 Update overmind.dm 2018-01-07 23:18:28 -05:00
deathride58 406df3ae92 Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076 
[MIRROR] Fixes diagonal movement in pipes
 2018-01-08 04:18:06 +00:00
deathride58 432fdfc0d3 Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097 
[MIRROR] Fixes can_cast short circuit
 2018-01-08 04:17:42 +00:00
deathride58 984bf470d5 Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093 
[MIRROR] fixes some grinder recipes
 2018-01-08 04:17:29 +00:00
deathride58 266457c274 Update title.dm 2018-01-07 23:17:11 -05:00
deathride58 c0d2fe8817 Merge pull request #4707 from Citadel-Station-13/upstream-merge-33979 
[MIRROR] Implements the Ballmer Peak: Now the bartender can help R&D!
 2018-01-08 04:16:38 +00:00
deathride58 91531525ca Merge pull request #4706 from Citadel-Station-13/upstream-merge-33971 
[MIRROR] Newly crafted stacks are merged with held stacks of the same type
 2018-01-08 04:16:01 +00:00
deathride58 57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
 2018-01-08 04:15:47 +00:00
deathride58 ba909ce9a2 Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128 
[MIRROR] Removes the safe dial multiplier
 2018-01-08 04:15:12 +00:00
deathride58 d11604e502 Merge pull request #4703 from Citadel-Station-13/upstream-merge-34129 
[MIRROR] Adds package wrapping to autolathes
 2018-01-08 04:14:52 +00:00
deathride58 da3d982ed6 Merge pull request #4701 from Citadel-Station-13/upstream-merge-34118 
[MIRROR] Reduces the memory footprint of the gas_mixture datum
 2018-01-08 04:14:22 +00:00
deathride58 b18d720730 Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119 
[MIRROR] Fixes uplink_purchase_log GC error
 2018-01-08 04:14:04 +00:00
deathride58 d1d2ed1139 Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157 
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
 2018-01-08 04:13:47 +00:00