shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,430 Commits 5 Branches 0 Tags
74c607b2dfd1ffd52230be35a5a165ebb32fb522
Commit Graph

21430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TrilbySpaceClone
74c607b2df Ghommie Asked 2019-06-23 17:15:03 -04:00
Trilbyspaceclone
92c86eb7cf Merge pull request #53 from Trilbyspaceclone/Just-in-case-pls 
No...
 2019-06-23 02:54:32 -04:00
Trilbyspaceclone
8418ce8a34 Merge branch 'Poojawa_How_Do_I_Update_My_Shit' into Just-in-case-pls 2019-06-23 02:54:02 -04:00
TrilbySpaseClone
0ea7ce3731 No... 2019-06-23 02:51:01 -04:00
Trilbyspaceclone
4278284e7b Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit 2019-06-23 01:52:59 -04:00
TrilbySpaseClone
7f4d60ae25 Poojawa this would been easyer with webedits 2019-06-23 01:49:45 -04:00
CitadelStationBot
2f96e40120 Automatic changelog generation for PR #8690 [ci skip] 2019-06-21 21:33:37 -05:00
Thalpy
498c35b733 Fixes empathy antag check exploit. (#8690) 
* Fixes exploit

* Wrong way round..!

* Should be okay for antags now.

* Fixed githuba being dumb
 2019-06-21 19:33:34 -07:00
poptar4551
88dd4bdc99 Brings back Big Wolf ears for humans (#8668) 
* Brings back Big Wolf ears for humans

This use to be here, and I'm no furry, but it needed to come back.

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
 2019-06-21 19:32:21 -07:00
deathride58
540fa77795 Merge pull request #8702 from Citadel-Station-13/commjacketfix 
Fixes jacket dir
 2019-06-20 18:12:19 -04:00
Jay
f35eb97522 Fixes jacket dir 2019-06-20 02:19:34 -05:00
CitadelStationBot
601db5ff51 Automatic changelog generation for PR #8602 [ci skip] 2019-06-17 13:20:28 -05:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602) 
* Gentials layered under underclothes

* screm
 2019-06-17 11:20:25 -07:00
CitadelStationBot
27c4288e5d Automatic changelog generation for PR #8658 [ci skip] 2019-06-17 13:18:52 -05:00
Ghom
95dc8084f1 Moving some tablecrafting recipes to the appropriate categories (#8658) 
* Moving some recipes to the appropriate categories

* Fixes the not-a-sandwich recipe being M.I.A.
 2019-06-17 11:18:49 -07:00
Ghom
2845428c03 ports "Improve efficiency of SSmapping init" (#8651) 2019-06-17 11:18:28 -07:00
Ghom
d60a360e90 Ports "Removes firebug from goonchat" (#8650) 
* Ports "Removes firebug from goonchat"

* fucking acient goonchat pre-sync stuff.
 2019-06-17 11:17:38 -07:00
kevinz000
4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs 
Adds Hoverchairs and the paraplegic trait.
 2019-06-17 11:13:43 -07:00
Fermi
0457026c0f Missed another. 2019-06-17 12:15:54 +01:00
Fermi
dd7421f130 Missed one. 2019-06-17 12:05:21 +01:00
Fermi
02de745519 Merge branch 'Wheelchairs' of https://github.com/Thalpy/Citadel-Station-13 into Wheelchairs 2019-06-17 12:02:56 +01:00
Fermi
2681a8f7a9 Updates has_trait to HAS_TRAIT 2019-06-17 12:02:39 +01: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