shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,399 Commits 5 Branches 0 Tags
77652e6cbb0c2df246023a5259faf28250099796
Commit Graph

21399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trilbyspaceclone
77652e6cbb Makes upgraded prostics worth getting 2019-06-17 12:57:49 -04:00
kevinz000
6c54c21d9c Merge pull request #8653 from Citadel-Station-13/commjacket 
Donator Comm Jacket - [Ready]
 2019-06-16 19:54:24 -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
CitadelStationBot
5ad5279138 Automatic changelog generation for PR #8648 [ci skip] 2019-06-16 21:47:12 -05:00
kevinz000
28ca8dee46 Merge pull request #8648 from Trilbyspaceclone/patch-178 
Buffs uplink kits
 2019-06-16 19:47:09 -07:00
CitadelStationBot
d08eeeee4c Automatic changelog generation for PR #8584 [ci skip] 2019-06-16 21:43:12 -05:00
kevinz000
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
CitadelStationBot
107e4c40cf Automatic changelog generation for PR #8505 [ci skip] 2019-06-16 21:42:17 -05: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
CitadelStationBot
42b5ec3159 Automatic changelog generation for PR #8497 [ci skip] 2019-06-16 21:41:59 -05:00
kevinz000
27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors 
Adds Clockwork Reflectors
 2019-06-16 19:41:57 -07:00
CitadelStationBot
1ec01d3a7f Automatic changelog generation for PR #8561 [ci skip] 2019-06-16 21:40:52 -05:00
kevinz000
7b71d20d8e Merge pull request #8561 from Ghommie/Ghommie-cit38 
Ports in emoji.dmi updates, plus flushed emoji.
 2019-06-16 19:40:49 -07:00
CitadelStationBot
c5a205e06c Automatic changelog generation for PR #8570 [ci skip] 2019-06-16 21:40:03 -05: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
CitadelStationBot
9d014d3bbe Automatic changelog generation for PR #8578 [ci skip] 2019-06-16 21:38:25 -05: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
CitadelStationBot
e186b6515d Automatic changelog generation for PR #8652 [ci skip] 2019-06-16 21:35:58 -05: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
CitadelStationBot
aa2723631e Automatic changelog generation for PR #8643 [ci skip] 2019-06-16 21:35:31 -05: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
CitadelStationBot
65ac93a144 Automatic changelog generation for PR #8416 [ci skip] 2019-06-16 21:35:08 -05: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
9b226953af Merge pull request #8617 from Poojawa/ds9-mystery 
The DS9 Uniform mystery
 2019-06-16 19:33:02 -07:00
CitadelStationBot
df436e93c4 Automatic changelog generation for PR #8579 [ci skip] 2019-06-16 21:32:40 -05: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
CitadelStationBot
6b40be0b7b Automatic changelog generation for PR #8614 [ci skip] 2019-06-16 21:31:11 -05: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
CitadelStationBot
12c3fb32df Automatic changelog generation for PR #8618 [ci skip] 2019-06-16 21:29:06 -05: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
LetterJay
92e0d7c20b Update custom_items.dm 2019-06-16 20:54:27 -05:00
LetterJay
6b903893b2 Update __donator.dm 2019-06-16 20:54:02 -05:00
LetterJay
f1e1eac13a Delete DELETEME.txt.txt 2019-06-16 18:18:48 -05:00
Jay
8d07ab33be DELETEME.txt.txt 2019-06-16 18:17:21 -05:00
Trilbyspaceclone
5716ea7a4b Update shields.dm 2019-06-16 10:22:07 -04: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
CitadelStationBot
4a88cce82e Automatic changelog generation for PR #8565 [ci skip] 2019-06-16 03:19:53 -05: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
CitadelStationBot
d91700dcfe Automatic changelog generation for PR #8591 [ci skip] 2019-06-16 03:16:15 -05:00
kevinz000
1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43 
You smell that? Napalm, son.
 2019-06-16 01:16:12 -07:00
CitadelStationBot
743ac969e6 Automatic changelog generation for PR #8479 [ci skip] 2019-06-16 03:13:10 -05: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
0dc9d92b8b Merge pull request #8596 from Poojawa/ball-fixes 
fixes testicle runtimes
 2019-06-16 01:12: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