shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,109 Commits 5 Branches 0 Tags
c8b9e94d1e4dfbdc20961b4c19c843142c3378fc
Commit Graph

358 Commits

Author SHA1 Message Date
deathride58
c8b9e94d1e Merge pull request #7354 from Trilbyspaceclone/patch-6 
Removes armor form Non-head only Trek suits
 2018-07-10 02:04:18 -04:00
deathride58
914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550 
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
 2018-07-10 02:03:08 -04:00
deathride58
1145a66ec3 Merge pull request #7345 from LetterN/patch-5 
adds plushnar and plushvar on chapvendors
 2018-07-10 02:01:21 -04:00
deathride58
fc9b99173b Merge pull request #7344 from LetterN/fix-1 
fixes lewd handcuffs
 2018-07-10 01:59:36 -04:00
deathride58
c1ae3a7ba6 fixes democracy 2018-07-07 14:10:32 -04:00
Trilbyspaceclone
00f84818a1 Remove spaces at the ends of the paths 
Ima dork and forgot to remove those
 2018-07-07 09:13:23 -04:00
Trilbyspaceclone
1e31149039 Removes the //Cit Change 2018-07-07 00:48:04 -04:00
TrilbySpaceClone
7f9365e1db Modularized, plz dont yell at me 2018-07-06 17:42:24 -04:00
TrilbySpaceClone
54779cae1d Modularized, plz dont yell at me 2018-07-06 17:37:50 -04:00
TrilbySpaceClone
71c259b0c4 MoModularized, plz don't yell at me 2018-07-06 17:33:07 -04:00
Trilbyspaceclone
0b0820937d Update trek_under.dm 2018-07-06 14:03:04 -04:00
Trilbyspaceclone
114c53c4f2 Removes armor form Non-head only suits 
Basically get better armored suits then sec do!
 2018-07-06 13:46:24 -04:00
Letter N
c258941098 Update vending.dm 2018-07-06 17:26:55 +08:00
Letter N
5c79a794ec Update holy_weapons.dm 2018-07-06 17:20:30 +08:00
Letter N
bff55cc362 Update handcuffs.dm 2018-07-06 17:19:56 +08:00
LetterJay
981743a170 Update custom_items.dm 2018-07-06 00:54:21 -05:00
LetterJay
5ad7fc35fd Update __donator.dm 2018-07-06 00:54:01 -05:00
LetterJay
a64dba6270 Merge branch 'flagcape' 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:51:42 -05:00
LetterJay
b245b940a4 Update custom_items.dm 2018-07-06 00:46:48 -05:00
LetterJay
5cacbfbe2e Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape 
# Conflicts:
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:45:52 -05:00
LetterJay
637c64f55b fuk 2018-07-06 00:42:25 -05:00
deathride58
5f4e19000d Merge pull request #7308 from Citadel-Station-13/kevinz000-patch-9 
protects load_mentors from accidental wipe due to advproccall interrupting sql operations
 2018-07-06 01:40:20 -04:00
LetterJay
034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings 
Adds devilwings donor item for kitsun
 2018-07-06 00:40:00 -05:00
deathride58
cec2871db2 Merge pull request #7293 from LetterN/patch-4 
fixes kinkmate
 2018-07-06 01:36:15 -04:00
deathride58
5924595c8d adds icon_override 2018-07-06 00:48:21 -04:00
LetterJay
8e0a1a64af oops 2018-07-05 23:44:44 -05:00
LetterJay
f8828db041 donator cape 2018-07-05 23:43:47 -05:00
deathride58
759dddb821 Fixes signals 2018-07-05 01:42:05 -04:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
deathride58
cc628a905e two major fixes - fixes flavortext and right click exploit 2018-07-04 16:41:55 -04:00
Letter N
abc32ed0df adds "cap's female formal outfit" (#7307) 
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
 2018-07-04 05:37:01 -07:00
kevinz000
80f8f7e1b1 Update mentor.dm 2018-07-03 06:33:33 -07:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
Letter N
493a356338 Update machine_circuitboards.dm 2018-07-02 09:13:28 +00:00
deathride58
5c2b858e4c Merge pull request #7228 from improvedname/rubber-shot-edition! 
adds rubbershot versions for sec rifless
 2018-06-26 14:08:25 -04:00
deathride58
4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1 
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
 2018-06-26 14:06:32 -04:00
deathride58
293f484535 Merge pull request #7108 from Citadel-Station-13/kevinz000-patch-9 
removes magicarp from gold cores
 2018-06-26 14:05:43 -04:00
deathride58
be532c5c7f Merge pull request #7079 from Citadel-Station-13/kevinz000-patch-7 
hopefully fixes kinkmates dropping boozeomat parts
 2018-06-26 14:04:27 -04:00
deathride58
0d522533b7 Merge pull request #7078 from Michiyamenotehifunana/powercrepe-in-nam 
Adds a tiny "pocket" to the M1 Helmet (flak helmet)
 2018-06-26 14:04:13 -04:00
Improvedname
7dec7223c2 rubber2 2018-06-23 15:06:36 +02:00
Improvedname
110c53b724 rubberoo 2018-06-23 14:48:00 +02:00
deathride58
aee56b1f3d lets dogborg tongues reduce firestacks when they lick faces (#7148) 2018-06-18 11:53:59 -07:00
Cw 3040
27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141) 
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
 2018-06-18 11:52:11 -07:00
Letter N
5813950aff fixes shock collars 2018-06-18 14:28:43 +08:00
deathride58
842b64646b Update custom_items.dm 2018-06-17 05:44:13 -04:00
Michiyamenotehifunana
e4e0e0d91d Adds random things for Jay to do things with 2018-06-15 13:50:15 +08:00
kevinz000
a9100a89a6 modularize 2018-06-14 15:35:25 -07:00
ShizCalev
901dd94253 Corrects climax cooldown timer message, makes relieve message pronounsensitive (#7086) 2018-06-13 19:27:19 -07:00
kevinz000
e86c48b7a2 Update vending.dm 2018-06-12 03:51:03 -07:00
Michiyamenotehifunana
b62b9de0c1 Adds a tiny "pocket" to the M1 Helmet 2018-06-12 16:02:25 +08:00