shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,901 Commits 5 Branches 0 Tags
2c337dac8145b35e8d25de80015253f16124c0bd
Commit Graph
7858 Commits
Author SHA1 Message Date
LeoandCitadelStationBot d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy 
Fixes non-holy mobs purifying BBS
 2018-01-10 03:12:16 -06:00
orangesandCitadelStationBot 1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -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
RobustinandCitadelStationBot 34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
Jordan BrownandCitadelStationBot 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
AnturKandCitadelStationBot f6ef771ccd Fixes teleport camera (#34113) 2018-01-08 22:09:14 -06:00
orangesandCitadelStationBot 3671228196 Merge pull request #34110 from Armhulen/patch-40 
shadowshroom nerf reverted
 2018-01-08 20:07:57 -06:00
deathride58 9337c29450 who will win: a thousand yiffy snowflakes, or 1 misplaced \" 2018-01-08 18:24:47 -05:00
deathride58andGitHub 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 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
deathride58andGitHub d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
ShizCalevandCitadelStationBot 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 HiggsandCitadelStationBot 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
deathride58andGitHub e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 6bb49b1332 Update say.dm 2018-01-07 23:19:11 -05:00
deathride58andGitHub 9decb2e2b2 Update overmind.dm 2018-01-07 23:18:28 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 266457c274 Update title.dm 2018-01-07 23:17:11 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 94b664f934 Update ridden.dm 2018-01-07 23:10:44 -05:00
kevinz000andCitadelStationBot cbe0a9a05d Fixes component forensics deleting old instead of new component. (#34058) 
* component dupe unique

* sorry I was using webeditor on phone and it wouldn't let me tab
 2018-01-07 21:50:23 -06:00
Dax DupontandCitadelStationBot d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
orangesandCitadelStationBot 1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
MoreRobustThanYouandCitadelStationBot 02b63e199b Adds spaceturf check to blob overmind spawning 2018-01-07 20:52:01 -06:00
Jordan BrownandCitadelStationBot af27a1aa03 Fixes can_cast short circuit (#34097) 2018-01-07 20:49:50 -06:00
TlaltecuhtliandCitadelStationBot 7aa8bf9b69 fixes some grinder recipes (#34093) 
* commit

help what is this

* ddd

* sdsadsda

* fegdhfd

* ddddddddddddddd
 2018-01-07 20:36:29 -06:00
Emmett GainesandCitadelStationBot 65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
Jordan BrownandCitadelStationBot 065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
IamgoofballandCitadelStationBot 99b299a1eb Implements the Ballmer Peak: Now the bartender can help R&D! (#33979) 
* Implements the Ballmer Peak: Now the bartender can help R&D!

* fugg

* lmao forgot to multiply that

* unzips math

* asdaafffff

* buffs windows ME

* Adds notifications about the peak.
 2018-01-07 20:30:57 -06:00