shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,562 Commits 5 Branches 0 Tags
67f00fc04946f5f17e2b60afe78b28065e5dd280
Commit Graph

699 Commits

Author SHA1 Message Date
Ghommie
67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
kevinz000
69d48c5e5e Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit 
Removes Nudity Permits and replaces them with invisible gear harnesses
 2019-06-23 17:26:30 -07:00
kevinz000
dcab96d9d5 Merge pull request #8721 from Ghommie/Ghommie-cit77 
Ports in "Liver removal/failure now also stops passive reagent effects"
 2019-06-23 06:53:30 -07:00
kevinz000
df70e135bd Merge pull request #8711 from Ghommie/Ghommie-cit75 
Greytide Stationwide!
 2019-06-23 06:52:05 -07:00
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669) 
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
 2019-06-23 06:00:27 -07:00
Sishen1542
2bb56a900a Dab emote now checks restraint flags. (#8672) 
* Update cit_emotes.dm

* Revert "Update cit_emotes.dm"

This reverts commit 649007667db6f7d1fdd0f30e99bbaa268fbeb03c.

* Revert "Revert "Update cit_emotes.dm""

This reverts commit 7950f642bf32b4179d265fdb498451c3e05a10fe.
 2019-06-23 06:00:07 -07: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
Ghommie
45109776e1 Ports in "Liver removal/failure now also stops passive reagent effects" 2019-06-22 17:05:08 +02: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
Ghommie
69a302d4f4 Greytide Stationwide! 2019-06-22 00:03:28 +02:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602) 
* Gentials layered under underclothes

* screm
 2019-06-17 11:20:25 -07:00
kevinz000
6c54c21d9c Merge pull request #8653 from Citadel-Station-13/commjacket 
Donator Comm Jacket - [Ready]
 2019-06-16 19:54:24 -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
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
0dc9d92b8b Merge pull request #8596 from Poojawa/ball-fixes 
fixes testicle runtimes
 2019-06-16 01:12:08 -07:00
kevinz000
12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174 
Adds medical breifcases
 2019-06-16 01:11:11 -07:00
kevinz000
6598688dd7 Merge pull request #8604 from Sishen1542/Scrubswasagoodshow 
New loadout options: striped dress, bunny ears! & scrubs for MDs
 2019-06-16 01:06:39 -07:00
kevinz000
fa9c74cfa3 Merge pull request #8645 from Ghommie/Ghommie-cit49 
stops borgs from sprinting into negative cell charge.
 2019-06-16 01:04:09 -07:00
Jay
fcd093f566 commjacket 2019-06-16 02:11:00 -05:00
Ghommie
05066f241b Improving keborgs' movement, not removing. 2019-06-15 20:33:38 +02:00
Ghommie
280e7d7d81 stops borgs from sprinting into negative cell charge. 2019-06-15 04:36:40 +02:00
LetterJay
0a144545c5 Merge pull request #8625 from Trilbyspaceclone/Donator-1 
Blue Kimono for SFox63 - Donator
 2019-06-14 21:18:28 -05:00
Trilbyspaceclone
207b12e47a Update custom_items.dm 2019-06-11 19:11:15 -04:00
TrilbySpaseClone
7f3e2dd28b Kimono 
Adds blue Kimono for SFox63
 2019-06-11 18:00:08 -04:00
kevinz000
54b3568319 Merge pull request #8599 from Poojawa/pacifistic-vore 
Pacifists can nom things now, but not feed to others
 2019-06-11 11:13:01 -07:00
Sishen
661f064a03 Update _medical.dm 2019-06-10 08:15:44 -04:00
Sishen
30e77035da Update _medical.dm 2019-06-10 07:51:54 -04:00
AnalWerewolf
8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
Trilbyspaceclone
5c8f7b326f Update _medical.dm 2019-06-09 12:00:46 -04:00
Sishen
7b48c8899d loadoutsahoy 2019-06-09 11:21:41 -04:00
Poojawa
80659a540b Update modular_citadel/code/modules/arousal/organs/testicles.dm 
I guess

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-06-09 09:59:31 -05:00
Poojawa
3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
Poojawa
6bdf5f585a fixes testicle runtimes 2019-06-09 00:49:40 -05:00
kevinz000
be9a551eea Merge pull request #8566 from Ghommie/Ghommie-cit39 
Different combat mode message if user is on help intent.
 2019-06-08 12:05:17 -07:00
Ghommie
480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
Ghommie
53d5ad5820 no exclamation point. 2019-06-08 14:45:26 +02:00
Ghommie
fc536dcfe4 Urist McSpaceman goes vigilant! 
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
 2019-06-08 14:44:40 +02:00
kevinz000
eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp 
Clarifies a few things about subtler and how it should be used
 2019-06-08 01:24:36 -07:00
kevinz000
1ad200fcf4 Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl 
Schoolgirl outfits for the loadout menu
 2019-06-08 01:22:52 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
57246b5c4f No combat mode message if user is on help intent. 2019-06-07 19:36:09 +02:00
SkullyRoberts
1a5c487e22 Ported the nudity permit from RP and made it a loadout option 2019-06-07 12:37:37 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
AnalWerewolf
4ff12eebd0 he bork and he woof 2019-06-07 18:10:22 +10:00
Poojawa
67eb76b360 clarifies a few things 2019-06-06 18:56:26 -05:00
dtfe3
0b1da3f025 Update uniform.dm 2019-06-06 20:50:14 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
cd38a29449 Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals 
Ports RP's deer taur and adds Elven ears to mammals
 2019-06-05 01:44:05 -07:00