Commit Graph
1018 Commits
Author SHA1 Message Date
Jay e4ecb2894a bedsheet for donator 2019-07-02 09:41:04 -05:00
TrilbySpaceClone 5087b97e18 Trending spriter 2019-06-29 20:18:32 -04:00
kevinz000andGitHub bf6811b981 Merge pull request #8742 from Trilbyspaceclone/MW2_suit
[DF] Adds MW2 Para Trooper Jumpsuit for AWOO aka investigator77 - Donner item
2019-06-29 15:18:01 -07:00
kevinz000andGitHub a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
kevinz000andGitHub 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
deathride58andGitHub fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
2019-06-28 00:47:09 -04:00
deathride58andGitHub 775bbaba8b Merge pull request #8744 from Linzolle/fix-1
fix atmos helmet
2019-06-28 00:37:33 -04:00
deathride58andGitHub db6e8ecd4c Merge pull request #8755 from Poojawa/the-balls-should-be-inert
Fixes errant ball behaviour
2019-06-28 00:23:37 -04:00
deathride58andGitHub c4288b05e2 Merge pull request #8762 from Ghommie/Ghommie-cit90
New sprites for two of the most codersprite guns in the game.
2019-06-28 00:13:58 -04:00
Ghommie e03b1c2a36 lazy 2019-06-27 14:34:56 +02:00
Ghommie b1a63b603b adjustments. 2019-06-27 14:28:40 +02:00
Ghommie aed3623e6e New sprites for two of the most codersprite guns in the game. 2019-06-27 00:28:34 +02:00
Poojawa 00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
LetterJayandGitHub 5f99d9ec04 Fixes wrong item path for donator loadout 2019-06-25 09:50:35 -05:00
TrilbySpaceClone e84fd8942f fix 2019-06-25 03:08:40 -04:00
TrilbyspacecloneandGitHub 52f100998c Update custom_items.dm 2019-06-25 02:59:49 -04:00
TrilbySpaceClone 50aede119b all works 2019-06-25 01:50:35 -04:00
Linzolle 1f19b602c9 fix atmos helmet 2019-06-24 16:17:53 -05:00
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
TrilbySpaceClone b485d8e750 Saves jay the trouble
Im a good cat
2019-06-24 02:21:04 -04:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub df70e135bd Merge pull request #8711 from Ghommie/Ghommie-cit75
Greytide Stationwide!
2019-06-23 06:52:05 -07:00
kevinz000andGitHub 228df53c99 Merge pull request #8698 from Ghommie/Ghommie-cit72
Fixes "Penlights Cannot Give Eye Exams"
2019-06-23 06:41:03 -07:00
Ghomandkevinz000 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
Sishen1542andkevinz000 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
TrilbyspacecloneandGitHub 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
TrilbyspacecloneandGitHub 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 38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Ghommie 138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +02:00
Ghommie 45109776e1 Ports in "Liver removal/failure now also stops passive reagent effects" 2019-06-22 17:05:08 +02:00
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
Ghommie 44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Poojawaandkevinz000 bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
kevinz000andGitHub 6c54c21d9c Merge pull request #8653 from Citadel-Station-13/commjacket
Donator Comm Jacket - [Ready]
2019-06-16 19:54:24 -07:00
kevinz000andGitHub 9b226953af Merge pull request #8617 from Poojawa/ds9-mystery
The DS9 Uniform mystery
2019-06-16 19:33:02 -07:00
kevinz000andGitHub 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
LetterJayandGitHub 92e0d7c20b Update custom_items.dm 2019-06-16 20:54:27 -05:00
LetterJayandGitHub 6b903893b2 Update __donator.dm 2019-06-16 20:54:02 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 0dc9d92b8b Merge pull request #8596 from Poojawa/ball-fixes
fixes testicle runtimes
2019-06-16 01:12:08 -07:00
kevinz000andGitHub 12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
2019-06-16 01:11:11 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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