shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

19834 Commits

Author SHA1 Message Date
Ghommie 50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
Ghommie d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
Ghommie 1c93c43e20 Fixes roffle waffle, mushroom halluginogen and some invalid reagent. 2019-06-17 09:16:45 +02:00
Ghommie 8b5bab29b2 Buffs out certain stun spells. 2019-06-17 08:06:14 +02:00
BlackMajor 1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
Ghommie 519ad202df fixes. 2019-06-17 05:19:30 +02:00
Ghommie 1323ace579 Peanuts, peanut butter, and sandwiches. 2019-06-17 05:17:24 +02:00
kevinz000 9c50b9cb11 typo 2019-06-16 19:58:07 -07:00
kevinz000 3527664c40 Merge branch 'master' into sprint_stamina 2019-06-16 19:55:56 -07:00
deathride58 c6f3bd1fd1 Merge pull request #8575 from Citadel-Station-13/kevinz000-patch-41 
nerfs disablers 3 --> 3.5 ds cooldown
 2019-06-16 22:53:10 -04:00
deathride58 b487b0103b Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes 
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
 2019-06-16 22:52:47 -04:00
deathride58 7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline 
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
 2019-06-16 22:51:03 -04:00
deathride58 d0bc89353c Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48 
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
 2019-06-16 22:50:15 -04:00
kevinz000 28ca8dee46 Merge pull request #8648 from Trilbyspaceclone/patch-178 
Buffs uplink kits
 2019-06-16 19:47:09 -07:00
kevinz000 78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
kevinz000 302b235911 Merge pull request #8505 from BurgerLUA/RCDMEMES 
Clockwork Cult walls can no longer be deconstructed by RCDs when heated.
 2019-06-16 19:42:15 -07:00
kevinz000 27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors 
Adds Clockwork Reflectors
 2019-06-16 19:41:57 -07:00
kevinz000 27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170 
Ports origami skills for paper wiz loot
 2019-06-16 19:40:01 -07:00
kevinz000 1739ee1685 Merge pull request #8578 from Ghommie/Ghommie-cit41 
Clears up Extinguisher's slippery instructions.
 2019-06-16 19:38:23 -07:00
kevinz000 b6aef75eed Merge pull request #8652 from Ghommie/Ghommie-cit53 
Ports "areas_in_z after start population fix"
 2019-06-16 19:35:55 -07:00
kevinz000 430bc7f43f Merge pull request #8643 from Ghommie/Ghommie-cit48 
Fixes the sacrificial target icon not displaying on the cult objective alert.
 2019-06-16 19:35:28 -07:00
kevinz000 1a6450a2e2 Merge pull request #8416 from Trilbyspaceclone/patch-135 
Gives sec EVA suits storge some Sec Jetpacks
 2019-06-16 19:35:05 -07:00
kevinz000 6c560c566f Merge pull request #8579 from Trilbyspaceclone/patch-171 
Gives gangs a new shield and makes their boots cheaper
 2019-06-16 19:32:38 -07:00
kevinz000 67a00c9141 Merge pull request #8614 from Ghommie/Ghommie-cit44 
Portin "Fix chem dispensers starting with an extra power cell"
 2019-06-16 19:31:08 -07:00
kevinz000 d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood 
Adds more space ruins.
 2019-06-16 19:29:23 -07:00
kevinz000 9e85eb5757 Merge pull request #8618 from Trilbyspaceclone/Magless 
Corrects ammo boxes spawning, as well as buffs cargo shotgun crates
 2019-06-16 19:29:04 -07:00
Poojawa f19a3541a3 cleans up runtimes 2019-06-16 19:30:14 -05:00
Trilbyspaceclone 55fbbd8a3f Merge branch 'master' into Unmodular 2019-06-16 20:02:56 -04:00
TrilbySpaseClone b45c870ae4 Immodular 2019-06-16 19:58:49 -04:00
Poojawa 762a3e3c02 Ports revised job backend from TG 2019-06-16 18:45:26 -05:00
Ghommie 6f2b316b30 Oh yea, ghost seizure fix. 2019-06-17 00:40:51 +02:00
Ghommie b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
Ghommie b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Thalpy fb70b97d5b Tweaks hypnoquirk as the discord seems to really want it. 2019-06-16 20:24:36 +01:00
Thalpy 98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
Trilbyspaceclone 5716ea7a4b Update shields.dm 2019-06-16 10:22:07 -04:00
Fermi 2df7e208b5 Spellchecking. 2019-06-16 12:34:37 +01:00
Fermi 3caadb2009 pH calc redo, too confusing. 2019-06-16 12:22:13 +01:00
Ghommie a055f12394 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-16 12:41:06 +02:00
kevinz000 89dd3d4e87 Merge pull request #8657 from BlackMajor/Dunga 
HAHA WHOOPS I ACCIDENTALLY NUKED IT
 2019-06-16 03:11:26 -07:00
BlackMajor 979455d86a HAHA WHOOPS 2019-06-16 22:10:00 +12:00
kevinz000 4da303e64c Update RCD.dm 2019-06-16 02:26:53 -07:00
Fermi 8fb3022624 Classic me. 2019-06-16 10:25:43 +01:00
Ghommie ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
kevinz000 6149a44408 Merge pull request #8565 from SkullyRoberts/NudityPermit 
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
 2019-06-16 01:19:51 -07:00
kevinz000 b0264414b2 Merge pull request #8576 from Sishen1542/whipcrack 
Whips are long again (except yours, curator)
 2019-06-16 01:18:37 -07:00
kevinz000 1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43 
You smell that? Napalm, son.
 2019-06-16 01:16:12 -07:00
kevinz000 1c46bcef7e Merge pull request #8479 from Ghommie/Ghommie-cit21 
Krav maga leg sweep tweak.
 2019-06-16 01:13:08 -07:00
kevinz000 9c0cc52771 Merge pull request #8600 from Sishen1542/plushsalt 
Makes plushies not a 2% prize from the arcades
 2019-06-16 01:11:37 -07:00
kevinz000 12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174 
Adds medical breifcases
 2019-06-16 01:11:11 -07:00