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

763 Commits

Author SHA1 Message Date
kevinz000 a95fff589c Merge pull request #8966 from Poojawa/RLD-fix 
Gives RLD adaptive overlays, adds cable color to RCL sprites
 2019-07-29 04:41:07 -07:00
kevinz000 156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162 
allows the captain sabre sheat to hold stunswords.
 2019-07-29 04:37:21 -07:00
Ghommie a9e1fadcd4 allows the captain sabre sheat to hold stunswords. 2019-07-27 22:47:36 +02:00
BlackMajor b5ab3c1783 Merge pull request #8972 from Fractious/portTGNVG 
Port TG new NVGs sprites
 2019-07-28 01:55:06 +12:00
Fractious ba6c18c883 Port TG new NVGs 
QOL porting these 3 new sprites for the Sec NVG, Med NVG and Diag NVG. Why not?
 2019-07-25 22:00:25 -04:00
Sishen 68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen 612021b9d5 h 2019-07-25 21:43:02 -04:00
Poojawa b20d9ef21c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into RLD-fix 2019-07-25 04:57:18 -05:00
Poojawa 3dabf3c42f Fixes RLD overlays, adds cable color to RCL sprites 2019-07-25 04:50:40 -05:00
Ghommie fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
kevinz000 c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
kevinz000 f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries 
Batch check injuries
 2019-07-20 11:52:45 -07:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02: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
Carlen White 7c0cd0e40d Removes duplicate belts.dmi 2019-07-14 21:01:20 -04:00
kevinz000 2c41141d2f Merge pull request #8676 from Trilbyspaceclone/patch-176 
Adds a Rapier for 8 Trilby cats
 2019-07-14 14:46:44 -07:00
TrilbySpaceClone b2345b19ce critcal 2019-07-12 21:21:52 -04:00
CameronWoof d944c0bb27 Normalizes Air Alarms 2019-07-12 15:04:43 -07:00
kevinz000 280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil 
Zelus oil - CWC gear
 2019-07-12 07:41:28 -07:00
kevinz000 57891813db Merge pull request #8847 from Ghommie/Ghommie-cit123 
Porting in two bar signs.
 2019-07-12 07:36:29 -07:00
kevinz000 e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122 
Rubber toolboxes.
 2019-07-12 07:35:25 -07:00
kevinz000 aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness 
Makes combat boots look T A C T I C O O L
 2019-07-12 07:33:36 -07:00
TrilbySpaceClone 54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Tupinambis 8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
Tupinambis 0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. 2019-07-08 22:23:16 -05:00
deathride58 d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87 
ports "More variety for dorms bedsheets" + 3 new bed sheets.
 2019-07-08 18:06:11 -04:00
Ghommie 3ce1497ef2 Ports in two bar signs. 2019-07-08 17:02:08 +02:00
Ghommie 9043402483 Rubber toolboxes. 2019-07-08 14:34:14 +02:00
Cyprian b8d9139bb2 SHOEEEEEEEESgit statusgit status 2019-07-08 01:58:02 +02:00
kevinz000 1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101 
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
 2019-07-07 02:39:07 -07:00
Ghommie 3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
kevinz000 ba74189192 Merge pull request #8768 from Ghommie/Ghommie-cit94 
New sprites for the some pda cartridges.
 2019-07-03 13:47:53 -07:00
kevinz000 bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
Ghommie b2c5e002ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94 2019-07-03 02:50:49 +02:00
Sishen a6f1d62c09 whoops accidentally left proto cans in 2019-06-30 16:26:41 -04:00
Sishen 6105f19c37 Update atmos.dmi 2019-06-30 16:20:54 -04:00
Ghommie f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
TrilbySpaceClone 5087b97e18 Trending spriter 2019-06-29 20:18:32 -04:00
kevinz000 bf6811b981 Merge pull request #8742 from Trilbyspaceclone/MW2_suit 
[DF] Adds MW2 Para Trooper Jumpsuit for AWOO aka investigator77 - Donner item
 2019-06-29 15:18:01 -07:00
Ghommie ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie 0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42 
[Ready]Reskinnable PDAs.
 2019-06-28 20:30:05 -07:00
Ghommie 513f0af0fa turns out the curator cartridge already had an (unused) sprite. 2019-06-28 17:14:57 +02:00
kevinz000 6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76 
Sort of porting MRE rations from Yogstation.
 2019-06-28 05:28:35 -07:00
kevinz000 83f84b01a1 Merge pull request #8700 from Sishen1542/trenchcloak 
Adds a reskin option for HoS tenchcoat, the trenchcloak!
 2019-06-28 05:24:11 -07:00
Ghommie 180ab72b78 more changes. 2019-06-28 03:45:42 +02:00
Ghommie 8d9832938f New sprites for the curator, lawyer and roboticist pda cartridges. 2019-06-28 03:31:46 +02:00
TrilbySpaceClone 62c4a5afc9 readds missing 2019-06-25 03:14:08 -04:00
TrilbySpaceClone 50aede119b all works 2019-06-25 01:50:35 -04:00
Ghommie 67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00