shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

362 Commits

Author SHA1 Message Date
Jordan Brown
8261e15126 Fixes the mapdiffbot issue 2018-01-28 21:18:21 -05:00
deathride58
3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains 
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
 2018-01-18 06:28:04 +00:00
deathride58
8c743141da Merge pull request #4721 from deathride58/genitalexamine 
Exposed genitals will now add details onto examine text
 2018-01-18 04:56:50 +00:00
LetterJay
72a9030f6a donate fix 2018-01-12 20:05:50 -06:00
LetterJay
946d0243ce donation item fix 2018-01-11 20:37:54 -06:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
deathride58
9fd87720ae Reduces detail in some genital descriptions, makes breasts only leak when aroused 2018-01-08 21:52:06 -05:00
deathride58
b3ff238cb8 you can now examine people with exposed genitals to see details 2018-01-08 20:45:08 -05:00
deathride58
ed2cf5e164 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into theprthatbulliesjanitormains 2018-01-08 15:44:05 -05:00
LetterJay
5486f71010 woo 2018-01-01 07:30:50 -06:00
cebutris
8c6d660611 adds functional cebusoap 2017-12-30 10:04:03 -05:00
LetterJay
1047dccdd5 fk 2017-12-29 01:20:09 -06:00
LetterJay
1a2ccbbd53 Merge branch 'master' into theprthatbulliesjanitormains 2017-12-22 02:56:10 -06:00
LetterJay
30796ad342 Update cit_arousal.dm 2017-12-19 17:56:06 -06:00
Michiyamenotehifunana
e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
deathride58
bf61f55b25 Fixes donator items not rendering properly when worn 2017-12-12 20:16:51 -05:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
deathride58
f75b36af75 Merge pull request #4176 from Michiyamenotehifunana/holy-crap-it-took-so-long-to-make-this-armor 
Adds RGB knights and more!
 2017-12-08 18:54:59 +00:00
LetterJay
828df6f12a rreeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 2017-12-05 07:14:48 -06:00
deathride58
0fc1837c3a standardizes wearable donor icon names, fixes recent donor items not rendering properly 2017-12-04 20:23:15 -05:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
LetterJay
985c8ea86b donation 2017-12-04 02:14:16 -06:00
LetterJay
03b7839e41 donation fix 2017-12-03 06:07:20 -06:00
Michiyamenotehifunana
867810ab8c massive overhaul of RGB stuff and massive additions 
halp
 2017-12-02 00:06:42 +08:00
LetterJay
4b25b45701 donation 2017-11-30 07:49:42 -06:00
deathride58
72495c4b92 Merge branch 'master' into theprthatbulliesjanitormains 2017-11-27 03:15:46 +00:00
kevinz000
5d53a5dc75 Update cit_guns.dm 2017-11-24 12:50:46 -08:00
deathride58
525ef1bc65 gives janitors a liiiiiiiiiiiiil leeway 2017-11-24 01:59:39 -05:00
deathride58
751b61a9ab Merge pull request #4065 from Poojawa/layering-memes 
Edited breast sprites
 2017-11-24 00:20:29 +00:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
deathride58
60b2c25668 donator item modularization + manual sync of sprites upstream 2017-11-22 17:16:37 -05:00
Poojawa
33c1f85ff6 adjusts how boobs look sprite wise 
No more sports bra tits.
 2017-11-22 02:39:46 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
kevinz000
93592ca4ab Update cit_guns.dm 2017-11-20 16:46:20 -08:00
Michiyamenotehifunana
de05bd6896 no moar infinite metal 2017-11-19 16:57:47 +08:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
c98faf5bb5 Update _cit_helpers.dm 2017-11-18 00:23:19 -05:00
deathride58
bb690b24ba Update cit_crewobjectives_science.dm 2017-11-17 23:45:20 -05:00
LetterJay
cd9bab3052 Merge pull request #3799 from deathride58/furtherboxedits 
Boxstation Edits: Legless Warden edition
 2017-11-04 22:50:58 -05:00
deathride58
1c38ebd9e4 tons of map changes to go around 2017-11-04 00:55:56 -04:00
Michiyamenotehifunana
6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
Michiyamenotehifunana
d7e0857716 Polishes code for recolorable assets 
Moves things around a bit to hopefully be more optimized and have lower chance of breaking
 2017-11-01 23:33:24 +08:00
LetterJay
d5aa1caca8 Merge pull request #3715 from Michiyamenotehifunana/misc-bug-fixes 
Fixes Mk.37Fs needing permits and Toy NEBs being able to turn into Dual Toyswords
 2017-11-01 01:40:20 -04:00
LetterJay
fec29755ad Merge pull request #3714 from Michiyamenotehifunana/rebalancing-excessive-nerfs 
Further rebalancing of Cit_guns projectiles
 2017-11-01 01:40:08 -04:00
Michiyamenotehifunana
e0a153c4c7 9mm frangibles now requires hacked lathes, costs slightly less 
They are by all means, lethal, even if they absolutely pale in comparison to regular bullets. They'll cost ever so slightly less materials to build.
 2017-10-31 19:47:20 +08:00
Michiyamenotehifunana
f25c1b5cce CRITICAL FIX FOR EXPLODING TOYS 
OH GOD THIS IS SUCH A HILLARIOUS OVERSIGHT
 2017-10-31 19:00:04 +08:00
Michiyamenotehifunana
beb27926b2 Fixes Cit's Toys a little 
Mk.37F no longer needs a permit, Non euplastic blade no longer can turn into dual toyswords
 2017-10-31 18:00:45 +08:00
Michiyamenotehifunana
068976c971 Rebalances citprojectiles somewhat 
Magjectiles have had their speed and range nerfed by about 50%, non lethal 9mms have lower speed and drastically lower range.
 2017-10-31 16:37:09 +08:00
Michiyamenotehifunana
9ea376dc81 fixes soporifics having the old two shot value 
SSSSSH JUST PRETEND IT WAS A MISTAKE
 2017-10-30 17:33:01 +08:00