shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,597 Commits 5 Branches 0 Tags
d3306e2eeccdf9fbc06df57731ff4caf198c2ea0
Commit Graph

4364 Commits

Author SHA1 Message Date
Poojawa 3dabf3c42f Fixes RLD overlays, adds cable color to RCL sprites 2019-07-25 04:50:40 -05:00
Ghommie 6c712a6931 Implementing nerfs. 2019-07-24 17:58:24 +02:00
Ghommie 969aaad3d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-07-24 17:35:29 +02:00
Lasse Andersen aac71758b7 Cloning console board memory 
Makes the cloning console circuit board have local memory of the records of the console.
 2019-07-23 14:25:03 +02:00
Michiyamenotehifunana 2845cb2e7d Resprites RCDs and RPDs 2019-07-23 20:23:45 +08:00
kevinz000 f114094138 Merge pull request #8926 from Thalpy/Secbats 
Secbats
 2019-07-22 20:15:36 -07:00
Thalpy 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Fermi 309bc1c899 Requested change. 2019-07-20 20:34:44 +01:00
Ghom 85f87b6679 Update code/game/objects/items/melee/energy.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-07-20 21:26:18 +02:00
kevinz000 c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
kevinz000 ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT 
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
 2019-07-20 11:59:05 -07:00
kevinz000 08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
Fermi e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi 75d6768ba7 Changed how the box works so it's not a storage. 2019-07-19 22:12:05 +01:00
Ghommie 12f2b767ab removes stamina-free spammability. 2019-07-19 21:23:07 +02:00
Ghommie b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Fermi 4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58 9ebdad68b7 Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61 
Fixes RPD infinite transit tube stacking
 2019-07-17 17:47:09 -04:00
BurgerLUA 03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT 2019-07-17 14:17:33 -07:00
Ghommie 05d839029a Late night coding that was yesterday's. 2019-07-17 16:03:05 +02:00
Ghommie b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +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
TrilbySpaceClone ba63926905 Sitting on the job 2019-07-16 22:42:57 -04:00
Ghommie ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie 0d1988b6be More fixes. 2019-07-16 16:10:16 +02:00
Ghommie 75a8cbcc39 Makes Zelus flasks a subtype of bottle. 2019-07-16 15:39:30 +02:00
Thalpy 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Ghommie dbb17a258a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:52:34 +02:00
Ghommie 16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:46:13 +02:00
Ghommie fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie 1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Seris02 59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
kevinz000 c06d495731 Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC 
REMOVE #C8A5DC. COLOR STRONG.
 2019-07-14 14:48:49 -07:00
kevinz000 1564f38ff8 Merge pull request #8725 from Trilbyspaceclone/meme_tools 
Adds more bronze tools
 2019-07-14 14:48:27 -07: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
kevinz000 da8b43f054 Merge pull request #8785 from Trilbyspaceclone/Just_Smile! 
Makes Clowns and HonkMother Chaplins smile!
 2019-07-14 14:11:09 -07:00
kevinz000 2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
Thalpy f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
Ghommie a3a2fb03b6 My bad, my bad. 2019-07-14 14:21:28 +02:00
kevinz000 395b89d0a1 Update RPD.dm 2019-07-14 03:42:26 -07:00
kevinz000 b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 
Refactoring underwear to allow custom color preferences.
 2019-07-14 03:38:45 -07:00
kevinz000 2259ea2e1c Merge pull request #8874 from Ghommie/Ghommie-cit132 
Ports the Chem Master choose your pill PR plus post-improvements
 2019-07-14 03:33:37 -07:00
Thalpy 4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
TrilbySpaceClone b2345b19ce critcal 2019-07-12 21:21:52 -04:00
kevinz000 c012418cf7 Merge pull request #8734 from Ghommie/Ghommie-cit84 
Sort of porting "Changes the type pathing of some "random" items"
 2019-07-12 07:43:12 -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 650842b384 Merge pull request #8854 from Ghommie/Ghommie-cit126 
Stamina damage melee weaponry fixes.
 2019-07-12 07:36:01 -07:00