shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,119 Commits 5 Branches 0 Tags
a28d6b2b5abe3b5bddec94dbf9bee072939ff8e4
Commit Graph

747 Commits

Author SHA1 Message Date
kevinz000
a28d6b2b5a Update cit_emotes.dm 2019-07-18 13:22:44 -07:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina 
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
 2019-07-17 18:07:57 -04:00
kevinz000
b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy 
Adds discount plushies and a way to get random plushies at shift start
 2019-07-17 00:50:21 -07:00
kevinz000
0c658ba41a Merge pull request #8796 from Trilbyspaceclone/patch-190 
Russian Paratrooper Jumper Uniform fix
 2019-07-14 14:44:01 -07:00
kevinz000
735fc5fab6 Merge pull request #8845 from Ghommie/Ghommie-cit121 
Tweaking the 🅱️ emoji icon.
 2019-07-14 03:35:33 -07:00
kevinz000
44e9721d37 Merge pull request #8883 from CameronWoof/codifying-mrp 
Hexacrocin overdose no longer forces climax
 2019-07-14 03:34:37 -07:00
deathride58
a27222fba7 Merge pull request #8752 from Sishen1542/uhhhhh 
Slimepeople can now morph the shape and size of their genitalia.
 2019-07-13 20:15:28 -04:00
CameronWoof
68c6aa4fa9 ghommie's suggestions 2019-07-12 22:34:25 -07:00
Trilbyspaceclone
ea77d524e6 guess ill fuck up 2019-07-12 21:48:03 -04:00
CameronWoof
067ec1ac92 Removes forced climax from hexacrocin overdose 2019-07-12 18:33:13 -07: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
f2976caa59 Merge branch 'master' into patch-190 2019-07-08 17:58:41 -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
9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc." 
This reverts commit 1c6156dd0e.
 2019-07-08 07:17:49 +02: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
4256e4414b Update custom_items.dm 2019-06-30 14:47:07 -04:00
Trilbyspaceclone
933851eb12 Update __donator.dm 2019-06-30 14:42:32 -04: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
7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42 
[Ready]Reskinnable PDAs.
 2019-06-28 20:30:05 -07: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
Sishen
7813536d78 might as well add breast shapes to the mix 2019-06-26 09:50:35 -04:00
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Sishen
4d51214526 and tool length and breast size too 2019-06-25 22:36:36 -04:00
Sishen
2736596293 Morphing Genitalia! 2019-06-25 22:03:10 -04: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
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