Commit Graph

4941 Commits

Author SHA1 Message Date
Poojawa
d0d6bc37a6 Merge branch 'master' into job-menu-improvements 2019-08-02 11:55:28 -05:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
kevinz000
dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201
Ports "Gauze can now be applied to corpses #44199"
2019-08-02 00:54:57 -07:00
Poojawa
1893a8f319 correctly copy/pasta's the chaplain stuff 2019-08-01 11:14:50 -05:00
Poojawa
218cbe2dbc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-31 19:09:35 -05:00
Trilbyspaceclone
bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Michiyamenotehifunana
94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
kevinz000
e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix
Mobs eaten by His Grace now require a mind attached to count for ascension
2019-07-29 04:47:44 -07:00
kevinz000
2252b81798 Merge pull request #8964 from Trilbyspaceclone/patch-197
Makes steal a few steal objectives better worded and role restricted better
2019-07-29 04:42:20 -07:00
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
624d74f500 Merge pull request #8965 from Trilbyspaceclone/patch-198
Ports "Security can access gulag equipment reclaimer #45298"
2019-07-29 04:40:01 -07:00
kevinz000
8477a524ae Merge pull request #8978 from YakumoChen/cardbored
Removes stealth implant box integrity
2019-07-29 04:38:42 -07:00
kevinz000
2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-29 04:37:36 -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
kevinz000
7b7f4f8042 Merge pull request #8795 from Sishen1542/emp-rebalance
Buffs tracking beacon EMPs, and makes EMP damage temporarily disable mech equipment
2019-07-29 04:32:51 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
EgoSumStultus
223aa33b07 mind check 2019-07-28 04:43:06 -07:00
Ghommie
a9e1fadcd4 allows the captain sabre sheat to hold stunswords. 2019-07-27 22:47:36 +02:00
Ghommie
0a560b171c [s] ports "Fixes ore satchel exploits, various storage size circumventions." 2019-07-27 13:01:27 +02:00
YakumoChen
06d9dd8a52 !
Box no longer a damage sponge, deletes in one hit
2019-07-26 23:55:43 +00:00
Poojawa
8c63ea7b6d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-26 17:36:46 -05:00
Sishen
68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen
8563af71b3 Update security.dm 2019-07-25 21:43:02 -04:00
Sishen
612021b9d5 h 2019-07-25 21:43:02 -04:00
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
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
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
BurgerLua
60beff3420 Added 2019-07-20 17:42:00 -07:00
Fermi
309bc1c899 Requested change. 2019-07-20 20:34:44 +01: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
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