shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,414 Commits 5 Branches 0 Tags
40d9dee654d9529fc4a13cfd563b22c4ebcb7fae
Commit Graph

477 Commits

Author SHA1 Message Date
deathride58
40d9dee654 gives combat mode examine text and a message on activation (#7995) 2019-02-13 21:01:12 -08:00
Poojawa
2f2b089db1 Adds realism to pleasure (#7986) 2019-02-13 20:45:16 -08:00
Ghom
0449325212 Fixes invisible limb sprites. (#7951) 
* F

* FF

* FFF
 2019-02-05 18:05:34 -08:00
deathride58
8e48dc5456 moves twilightic's donor item to the neck category in the loadout menu (#7937) 2019-01-27 00:31:29 -08:00
deathride58
a81474a786 Merge pull request #7964 from CydiaButt13/lampstuff 
Adds a Lamp Plushie
 2019-01-26 00:05:21 -05:00
Cydia
c860a797fd Adds a Lamp Plushie 
Little lamp plushie, click clack.
 2019-01-24 22:28:28 -06:00
Ghommie
4bd1af0915 purifies /datum from this filth. 2019-01-19 00:55:15 +01:00
Ghommie
6d51dff3eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit2 2019-01-19 00:28:24 +01:00
Ghommie
4cefeb9ce2 1 2019-01-18 06:54:48 +01:00
deathride58
c7a082d70d Merge pull request #7931 from Citadel-Station-13/souldeath_neck 
Donator Item - Soul Necklace
 2019-01-14 22:00:33 -05:00
deathride58
a877e796d4 Merge pull request #7890 from Ragolution/endrapen 
Suicide Messages, Combat Messages, Uniforms Recovered
 2019-01-14 21:39:02 -05:00
LetterJay
a99a7fb937 update 2019-01-13 23:38:30 -06:00
LetterJay
0015e806ab donation item 2019-01-13 02:36:15 -06:00
Ragolution
245b2c1968 Removed knot conditionals 
whatever
 2019-01-12 03:45:25 -05:00
Ragolution
1fd7bfe969 oh whoops 2019-01-12 02:50:03 -05:00
Ragolution
18d2572e57 Code Improvements (again) 
Knowing what I know now makes me wanna go revamp every instance of suicide code but geez.
 2019-01-12 02:31:25 -05:00
Ragolution
77a28abccf Code improvements 
Thanks to @Ghommie for the suggestion.
 2019-01-09 22:07:11 -05:00
kevinz000
4a50b86b47 Revert "[Ready] Makes synda paper mask correct eye sight and flash proof (#7858)" 
This reverts commit 2b68547f8d.
 2019-01-08 10:09:48 -08:00
Trilbyspaceclone
2b68547f8d [Ready] Makes synda paper mask correct eye sight and flash proof (#7858) 
* Wow this is worthless

* Better tells
 2019-01-08 02:41:12 -08:00
Trilbyspaceclone
889216c8f6 [Ready] New Mute quirk as well as Paper bin and crayon box to load-outs! - Requested by Suru (#7867) 
* Fixing updater

* Update negative.dm

* Update backpack.dm

* Update negative.dm

* Update negative.dm
 2019-01-08 02:38:54 -08:00
Ignari-Coldstorm
eb7f5634d5 Changes Jukebox Availability (#7905) 
Changes the massive price of the jukebox to something much more affordable, as well as broadens access needed to use it.
 2019-01-08 02:30:24 -08:00
nik707
f30f787ccf Merge pull request #7860 from deathride58/fixessyndiemasks 
fixes the syndicate mask
 2019-01-06 14:31:44 -06:00
LetterJay
87dee7ff83 mime overalls - donator 2019-01-05 11:01:21 -06:00
Ragolution
2ab86321c3 Conforms with changes requested by the BhjinBot 
Really cool bot I can't believe we have something so advanced for our codebase.
 2019-01-04 16:45:06 -05:00
Ragolution
b3a5b22578 TRAVIS LEAVE ME ALONE 2019-01-04 07:18:28 -05:00
Ragolution
2292b06ad1 Improved attack verbs on dildos+ suicide improvements 
Adds a bracket that kept the suicide message from appearing and grants each dildo its own attack message, mostly.
 2019-01-04 02:45:34 -05:00
Ragolution
6aed6d5612 Fixes all vg/5th port uniforms that aren't commented out for whatever reason. 
I'm pissy that this was so easy and nobody else bothered to do it.
 2019-01-04 01:55:33 -05:00
Ragolution
52a68d2121 Suicide_Acts for Dildos 
By request.
 2019-01-04 01:19:06 -05:00
Lasshy KorshBot
e6b9c9c441 Adds a squeak emote (#7871) 
* Adds a squeak emote

Adds a cute squeak for insects

* Update cit_emotes.dm

* tabbed up last line, changed emote message.

* Changed spaces from tabs, fixed compiling issues

I don't know why they were spaces, should fix Compiling issues

* Fixed tab stuff AGAIN

Compiling should work now??

* Made audio file louder

It was too quiet

* Delete mothsqueak.ogg

* Fixed the audio on the .ogg

was too quiet

* Fixed / at the end and removed if human

* fixed indentation stuff again again
 2019-01-03 08:40:43 -08:00
deathride58
39a1e05b80 Merge pull request #7844 from Citadel-Station-13/kevinz000-patch-2 
Fixes who sorting, removes admin advanced who from non-adminghosted admins
 2019-01-03 07:49:11 -05:00
deathride58
fd5908c081 Makes it possible to instantly get on your feet at the cost of 20 buffered stamina (#7866) 2019-01-03 04:35:17 -08:00
deathride58
f2126c6d9e Makes stamcrit completely unaffected by health (#7865) 
* makes stamina completely unaffected by health

* oh, and these lines too
 2018-12-31 03:07:46 -08:00
deathride58
c1af846c58 fixes the syndicate mask 2018-12-28 20:26:38 -05:00
deathride58
a73d43a664 FIXES MASTER 2018-12-28 19:48:12 -05:00
LetterJay
1db9e44f5b Adds two donation items 2018-12-28 10:09:42 -06:00
kevinz000
721dd82c94 Update who.dm 2018-12-21 19:08:53 -08:00
kevinz000
4a63be40e5 Update who.dm 2018-12-21 18:53:49 -08:00
Poojawa
c6f11fdf77 Fixes star trek memes 2018-12-17 08:41:59 -06:00
nik707
90855b2aea Merge pull request #7812 from Citadel-Station-13/kevinz000-patch-19 
Nerfs banana spiders. Banana spiders however actually work now.
 2018-12-15 15:19:39 -06:00
Ragolution
ff8a2337ca Removes outfitting cost 
Removes loadout cost from sweaters because they're just sweaters.
 2018-12-15 16:02:51 -05:00
Ragolution
01c589f172 5th Port Sweater Adjustments 
Puts 5th port sweaters into the correct category and file.

Fixes sweaters not spawning.
 2018-12-15 06:38:32 -05:00
kevinz000
df55b465b1 removes poi spam and cleans up code 2018-12-11 08:37:10 -08:00
kevinz000
33f997c10d Update banana_spider.dm 2018-12-11 08:34:22 -08:00
Ragolution
1a2a8ec6ae Citadel: The Forgotten Sweaters (#7786) 
Wakes up the sleeping Sweaters hidden in turtlenecks.dm
 2018-12-06 20:57:48 -08:00
Qfunk4d
cfc74acc48 Update chat_commands.dm 
even more new words
 2018-12-03 19:49:20 -07:00
nik707
68bf6098bf Merge pull request #7765 from deathride58/cultbuffs 
Cult buffs (Makes most cult whispers not be shouted and makes stun spell guarantee stamcrit at the cost of a higher cost and reduced charges)
 2018-11-30 21:52:38 -06:00
BlackMajor
fb446cdfa4 Adds a peep 
yep.
 2018-11-26 23:16:34 +13:00
deathride58
b90c0714a6 removes modular citadel changes to the blood spell as well 2018-11-24 18:16:19 -05:00
LetterJay
a363007ad5 donator corgi 2018-11-24 13:26:17 -06:00
Qfunk4d
870bf3347c Update chat_commands.dm (#7744) 2018-11-19 20:10:00 -08:00