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

927 Commits

Author SHA1 Message Date
kevinz000
26c195dec8 Merge pull request #8971 from Linzolle/toxiclover 
makes slimepeople like toxic food
 2019-07-29 04:39:12 -07:00
kevinz000
11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157 
Fixes combatmode disarm pushing people on inaccessible tables and more.
 2019-07-29 04:38:14 -07:00
Ghommie
1adaf01839 Fixes combatmode disarm pushing people on inaccessible tables and more. 2019-07-26 22:55:46 +02:00
Linzolle
99720f12e5 makes slimepeople like toxic food 2019-07-25 20:55:18 -05:00
kevinz000
692f2322c0 Merge pull request #8928 from Ghommie/Ghommie-cit121 
Reverts a commit that reverted a fix.
 2019-07-25 17:43:14 -07:00
kevinz000
29c0a56fb9 Merge pull request #8929 from Ghommie/Ghommie-cit152 
Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.
 2019-07-25 17:41:42 -07:00
kevinz000
b6f2c67177 Merge pull request #8949 from Trilbyspaceclone/patch-194 
Removes armor from all star treck outfits/suits
 2019-07-25 17:40:08 -07:00
kevinz000
ff08743f65 Merge pull request #8934 from Trilbyspaceclone/loadout 
Removes a Rando plushies from loadout and adds in a few more items
 2019-07-23 20:33:09 -07:00
kevinz000
61e94bd7db Merge pull request #8940 from Citadel-Station-13/borgplush 
Borg Plush - Donator
 2019-07-23 20:30:16 -07:00
Trilbyspaceclone
6db3502294 Update trek_under.dm 2019-07-23 01:09:58 -04:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143 
Fixes named arg Knockdown calls.
 2019-07-22 20:17:30 -07:00
Jay
ad036ac36d adds for donator 2019-07-21 12:37:43 -05:00
TrilbySpaceClone
f315696937 fix n stuff 2019-07-20 22:19:03 -04:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
kevinz000
fc7a305c46 Merge pull request #8906 from Ghommie/Ghommie-cit141 
Sweaters now cover the groins too.
 2019-07-20 11:49:58 -07:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
7e99dd205a Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites. 2019-07-19 21:54:48 +02: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
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Ghommie
acaf628d89 Sweaters now cover groin too. 2019-07-16 10:23:02 +02: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
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000
a573689101 Merge pull request #8887 from Poojawa/last-word-hearing-psychics 
Gang victory news report and last words for discord bot
 2019-07-14 14:04:20 -07:00
kevinz000
d5f156925d Merge pull request #8884 from Ghommie/Ghommie-cit135 
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
 2019-07-14 03:37:36 -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
Poojawa
245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics 2019-07-13 10:18:13 -05:00
Poojawa
4d895ae6c0 Gang victory news report and last words for discord bot 
also slight improvement to gangster greetings
 2019-07-13 08:38:19 -05:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
CameronWoof
68c6aa4fa9 ghommie's suggestions 2019-07-12 22:34:25 -07:00
Ghommie
31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." 2019-07-13 06:42:09 +02: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
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
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
Ghommie
3ca31617aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114 2019-07-05 23:06:57 +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