shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,033 Commits 5 Branches 0 Tags
41f02fa24db0e6486d68e1881549f2ef49d6400a
Commit Graph

2340 Commits

Author SHA1 Message Date
Ghom
c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit 
ENDS THE PLUSHIE DRAMA
 2020-02-09 21:47:30 +01:00
Ghom
71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor 
Small guncode refactor but it works
 2020-02-07 23:13:21 +01:00
kevinz000
8107140aaf Merge pull request #10924 from Citadel-Station-13/Ghommie-patch-8 
Fixing whitelisted/donor loadouts
 2020-02-06 23:56:32 -07:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice 
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
 2020-02-06 23:52:49 -07:00
kevinz000
cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553 
Removing a couple troublesome NSFW useless and unused preferences.
 2020-02-05 23:45:30 -07:00
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate 
Almost all venders now can be restocked
 2020-02-05 23:44:30 -07:00
Ghom
3a1a40ebd2 Update read_from_file.dm 2020-02-05 23:41:52 +01:00
Ghom
4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks 
Consent logging
 2020-02-05 07:19:37 +01:00
Ghom
aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears 
Adds bunny ear style for humans and anthromorphs
 2020-02-05 06:50:10 +01:00
TrilbySpaceClone
06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
kevinz000
8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
Ghommie
0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
kevinz000
8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00
ancientpower
0fd4527096 updated icon 2020-02-03 12:28:53 -06:00
ancientpower
be0695e146 bunny ear style 2020-02-03 12:05:00 -06:00
Ghom
f8a2116d7d Merge pull request #10866 from ancientpower/skintone-match-fix 
Fixes genital skintone mismatching
 2020-02-03 08:57:39 +01:00
ancientpower
b55b375d17 fixes a bug with skintone in character creation 2020-02-02 22:59:36 -06:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546 
Something about runtime errors.
 2020-02-02 16:31:15 -07:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
Ghom
fb32b018ef Merge pull request #10838 from Owai-Seek/loadout 
Minor Loadout/Outfit Changes
 2020-02-02 18:07:00 +01:00
kevinz000
c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
kevinz000
2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats 
polychromic winter coats
 2020-02-02 01:46:58 -07:00
kevinz000
333c0dd201 Update modular_citadel/code/modules/reagents/reagents/cit_reagents.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 01:32:54 -07:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Ghom
c26c0cbe09 Merge pull request #10816 from ancientpower/ph-strip-fix 
pH strip feedback fix/tweak
 2020-02-02 01:40:49 +01:00
Ghom
a40d22fa45 Merge pull request #10800 from Seris02/moreslots 
fixes kevinz error with preferences.dm
 2020-02-01 18:44:29 +01:00
Ghommie
8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
Winter Flare
c3ca884273 Moved Nurse Stuff below Scrubs 2020-01-31 23:08:31 -05:00
Winter Flare
847946bfe3 Fix cause I'm dumb 2020-01-31 22:53:27 -05:00
Winter Flare
12c0e475d8 Add Nurse Stuff to Loadout, fixes. 2020-01-31 22:36:25 -05:00
Winter Flare
599185654f Rename, Add item to Loadout 
Renamed scrubs based on color, added Mailman Hat to loadout.
 2020-01-31 21:54:21 -05:00
Ghom
0925dc55c2 Merge pull request #10789 from Putnam3145/whoops-text 
Minor typo fix
 2020-02-01 01:42:08 +01:00
ancientpower
60476560cf concatenation tweak 2020-01-31 18:23:13 -06:00
ancientpower
c5e5092749 fixes a typo with ph strips and adds feedback 2020-01-31 17:29:52 -06:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
YakumoChen
9ba8a0e8e0 empty line 2020-01-31 14:15:59 +00:00
YakumoChen
babeea0b28 empty line 2020-01-31 14:15:38 +00:00
YakumoChen
77f6074c67 adds rings to loadout 2020-01-31 08:56:20 -05:00
Seris02
52e86a1ad6 yeet 2020-01-31 13:13:06 +08:00
Seris02
924d8a676c fixes kevinz error 2020-01-31 10:07:01 +08:00
necromanceranne
43c4debb4f Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. 2020-01-31 11:54:18 +11:00
Putnam
e9c3eb9eb4 . 2020-01-30 04:24:18 -08:00
Seris02
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
kevinz000
9df12f94d4 Merge branch 'master' into one_last_taser_attempt 2020-01-29 16:27:58 -07:00
kevinz000
cff69db1c3 Merge pull request #10773 from Putnam3145/whoops-gaseous 
Fixes to hypno toggle
 2020-01-29 15:51:01 -07:00
Lin
cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 
demodularize and removes lot of unused clothing with missing sprites.
 2020-01-29 19:58:26 +00:00