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

879 Commits

Author SHA1 Message Date
Trilbyspaceclone
ea77d524e6 guess ill fuck up 2019-07-12 21:48:03 -04:00
TrilbySpaceClone
f68501b101 rng 2019-07-12 21:24:44 -04:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00
kevinz000
bb568d633b Merge pull request #8852 from Tupinambis/CursedPlush 
Removes a plush representing the character of an underage player.
 2019-07-12 07:32:29 -07:00
kevinz000
b5cb68fc68 Merge pull request #8844 from Ghommie/Ghommie-cit120 
Fixes rocket launchers, buffing their accuracy etc.
 2019-07-09 08:30:44 -07:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Tupinambis
8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
deathride58
82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91 
Merging the end-of-shift and its shuttle autocall announcements into one.
 2019-07-08 18:04:27 -04:00
deathride58
df02b0b9ae Merge pull request #8817 from Poojawa/copy-vorpasta 
[s] Adjusts some bad copy/pasta code with vore mobs
 2019-07-08 17:53:28 -04:00
Ghommie
1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
LetterJay
a17b4ff953 Merge branch 'master' into singerydonator 2019-07-05 14:31:31 -05:00
LetterJay
678a08e883 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-07-04 14:23:37 -05:00
Poojawa
52f48c9294 let's keep them feedable at least, because that's a thing 2019-07-03 01:36:16 -05:00
Poojawa
c974fa1f63 Adjusts some bad copy/pasta code 
Oops
 2019-07-03 01:33:43 -05:00
Jay
e4ecb2894a bedsheet for donator 2019-07-02 09:41:04 -05:00
Jay
ad9ba89d34 Yellow out for donator 2019-07-01 12:20:52 -05:00
TrilbySpaceClone
5087b97e18 Trending spriter 2019-06-29 20:18:32 -04:00
kevinz000
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
kevinz000
a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79 
Ports "Removes SSreligion"
 2019-06-28 20:30:44 -07:00
kevinz000
7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42 
[Ready]Reskinnable PDAs.
 2019-06-28 20:30:05 -07:00
Ghommie
db0d1ae565 Applying requested changes. 2019-06-28 17:25:47 +02:00
deathride58
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
deathride58
db6e8ecd4c Merge pull request #8755 from Poojawa/the-balls-should-be-inert 
Fixes errant ball behaviour
 2019-06-28 00:23:37 -04:00
Ghommie
17371196ee Prevents the shuttle from being recalled (even if to no avail). 2019-06-27 16:51:14 +02:00
Ghommie
45467acdaf .. 2019-06-27 04:31:40 +02:00
Ghommie
17072eb809 . 2019-06-27 04:29:27 +02:00
Ghommie
e61f13634e Merging the end-of-shift and its shuttle call announcements into one. 2019-06-27 04:23:14 +02:00
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
LetterJay
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
Trilbyspaceclone
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
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
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
kevinz000
228df53c99 Merge pull request #8698 from Ghommie/Ghommie-cit72 
Fixes "Penlights Cannot Give Eye Exams"
 2019-06-23 06:41:03 -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
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
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
Ghommie
44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +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