Commit Graph

6085 Commits

Author SHA1 Message Date
kevinz000 f4c2f1d8bc Merge pull request #8952 from CdrCross/robust-cloner
Cloning console board memory
2019-07-25 17:45:50 -07:00
kevinz000 692f2322c0 Merge pull request #8928 from Ghommie/Ghommie-cit121
Reverts a commit that reverted a fix.
2019-07-25 17:43:14 -07:00
kevinz000 ebf985e117 Merge pull request #8933 from BurgerLUA/Cloning-Fix
Mild Cloning Nerf
2019-07-25 17:41:06 -07:00
Thalpy 123c9199ba Added Eigenlockers. I love them. 2019-07-25 20:51:09 +01: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
Trilbyspaceclone bb88bdc0c7 Update gulag_item_reclaimer.dm 2019-07-25 04:48:31 -04:00
Trilbyspaceclone 712790ba5b Update objective_items.dm 2019-07-25 04:15:57 -04: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
kevinz000 0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154
Fixing towels and improving them.
2019-07-23 20:34:09 -07: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
BurgerLUA 1195727617 snowflake-b-gone 2019-07-22 16:18:43 -07:00
Ghommie 3440757fd0 Glass. 2019-07-21 10:01:00 +02:00
Thalpy 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
BurgerLua 60beff3420 Added 2019-07-20 17:42:00 -07: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
kevinz000 8c93e48a01 Merge pull request #8896 from Bapldap/patch-1
Updates Blood Brother
2019-07-20 11:51:54 -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 7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02: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
Bapldap 2fec4a51b0 Update traitor_bro.dm 2019-07-15 13:26:21 -05: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
Ghommie 4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +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