shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

21280 Commits

Author SHA1 Message Date
Ghom e309497af2 Merge pull request #10339 from Seris02/teleivdrip 
telescopic IV drips
 2019-12-30 18:24:50 +01:00
Ghommie 80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Seris02 f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
Seris02 bebd1a4600 yee. 2019-12-30 23:52:36 +08:00
Ghom 110361f82b web-lazy-edit 
I'm on another branch
 2019-12-30 16:18:42 +01:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Seris02 9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
Seris02 1030698c10 did this actually change anything 2019-12-30 21:18:05 +08:00
Seris02 84574a150b weh 2019-12-30 21:00:25 +08:00
Seris02 8bb7a4a40d hnnnng 2019-12-30 19:24:07 +08:00
Seris02 bc2e4f3b5a desc 2019-12-30 19:08:37 +08:00
Seris02 2ca4c2e66a tiny fixes 2019-12-30 18:53:00 +08:00
Seris02 714f76c8aa more changes 2019-12-30 18:48:29 +08:00
Ghom 20de4dfe50 Merge pull request #10333 from Trilbyspaceclone/patch-255 
Makes grass distill into light beer
 2019-12-30 11:18:20 +01:00
Ghom 6e506c949e Merge pull request #10348 from Putnam3145/radiation 
fix divide by 0 runtime in new contam
 2019-12-30 11:08:52 +01:00
Ghom a6e72c8cad ok 2019-12-30 11:00:21 +01:00
Putnam 418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00
Putnam cb1403e095 oh yeah that's there too 2019-12-30 01:54:46 -08:00
Putnam 6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
KathrinBailey 283ccceb24 CE Locker Exodus: The Removaling 
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
 2019-12-30 09:25:03 +00:00
Putnam f2759abb4c fixed a runtime 2019-12-30 01:18:05 -08:00
Trilbyspaceclone 24d4684afb Maybe he means this? 2019-12-30 03:56:44 -05:00
Putnam 90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
kevinz000 24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000 fef66b1bd7 Merge pull request #10320 from Seris02/exclusion 
excludes certain ghost roles from being affected by health events
 2019-12-30 00:26:19 -08:00
kevinz000 eb00538843 Merge pull request #10331 from Trilbyspaceclone/patch-254 
Buffs borg hypo's
 2019-12-30 00:20:35 -08:00
kevinz000 ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480 
Fixing a few consistency issues with Nightmares.
 2019-12-30 00:15:03 -08:00
kevinz000 97aadba950 Merge pull request #10259 from Citadel-Station-13/revert-10126-he-tweaks 
Revert "Makes HE pipes realistically radiate away heat"
 2019-12-30 00:13:45 -08:00
kevinz000 80606f42ac Merge pull request #10334 from keronshb/REFLECTORBLOBPORT 
Ports reflector blobs
 2019-12-30 00:11:50 -08:00
kevinz000 d1434c767c Merge pull request #10335 from kappa-sama/patch-12 
mouth slice
 2019-12-30 00:11:38 -08:00
kevinz000 0dc55b209a Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix 
Fixes UI for poly collars
 2019-12-30 00:11:27 -08:00
kevinz000 74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000 3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel 
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
 2019-12-30 00:07:32 -08:00
kevinz000 47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
kevinz000 310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443 
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
 2019-12-30 00:03:21 -08:00
Putnam 1b7e9c6716 wow divide by 0 very cool 2019-12-29 22:03:23 -08:00
Seris02 8ef8d34dcc supermatter power+integrity changes 2019-12-30 13:31:35 +08:00
Putnam ad83211058 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-29 21:28:49 -08:00
Putnam a4c356ad57 added a cryo to the ghost cafe 2019-12-29 21:28:09 -08:00
Putnam cc087b990c Code improvements 2019-12-29 21:01:55 -08:00
Putnam3145 640419eed5 Merge pull request #10343 from Ghommie/Ghommie-cit494 
[s] Fixes anti-ghost-role vars a little.
 2019-12-29 20:54:55 -08:00
Seris02 40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Seris02 f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
Putnam ddf233e0d5 Made no antags show up after auto call 2019-12-29 18:53:49 -08:00
Putnam 93207cae0b made "random" more random 2019-12-29 18:53:27 -08:00
Putnam fb9b6dcc10 SCORING WRONG THE WHOLE TIME 2019-12-29 18:25:11 -08:00
Putnam fa35c5128c Rebalancing bloodsuckers a tad 2019-12-29 18:09:23 -08:00
deathride58 1b6359a175 [experimental] Buffs the stamina buffer by making it recharge for free. 2019-12-29 20:18:52 -05:00
deathride58 9ea99d4c81 nerfs limb stamcrit by doubling the base limb stam regen, making limbs regen stam at double the rate when disabled, and adding stam multiplier mechanics to limb stamloss 2019-12-29 20:01:21 -05:00