Commit Graph

19834 Commits

Author SHA1 Message Date
Ghommie ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Ghommie ca1e4b6e65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235 2019-10-20 07:29:32 +02:00
Ghommie 8cd93f2085 bad. 2019-10-20 07:28:04 +02:00
Trilbyspaceclone 656ff4d943 Lowers exotic carpet to 7k from 10k 2019-10-20 00:18:11 -04:00
kevinz000 9c8356d9ea Update defib.dm 2019-10-19 20:48:55 -07:00
YakumoChen e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChen 6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChen 61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChen 37f58798ab no crafting 2019-10-20 03:05:21 +00:00
kevinz000 8a8e36ba1c Update uplink_items.dm 2019-10-19 20:01:21 -07:00
kevinz000 659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2019-10-19 19:52:21 -07:00
kevinz000 094fdbd271 Update defib.dm 2019-10-19 19:49:48 -07:00
Hatterhat 2a45cd19fb boot holster boot holster 2019-10-19 20:24:00 -05:00
r4d6 49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
deathride58 f72d058eb5 makes borg flashes actually take eye protection into account 2019-10-19 17:57:05 -04:00
Linzolle eb1e064c49 oh yeah surgeon 2019-10-19 10:48:30 -05:00
Ghommie fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
Linzolle 39788c8216 fix abductors 2019-10-18 23:45:13 -05:00
JTGSZ 9b7c7b6e0f RPD works again 2019-10-18 23:55:40 -04:00
MrJWhit fc9e7487b0 Reduces stamloss of weapons by 20%
This text will be removed later
2019-10-18 22:46:48 -04:00
Linzolle c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Ghommie 9cb1f2b9d9 Little stunbaton nerf (split off from #9500) 2019-10-18 18:37:15 +02:00
Ghommie 2ca246d2eb fine-o 2019-10-18 18:33:02 +02:00
Ghommie 17191c5e22 mimes. 2019-10-18 18:23:27 +02:00
Ghommie 9981eb916a clowns. 2019-10-18 18:16:11 +02:00
Ghommie 69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02:00
Poojawa c7e1449a3c re-adds blood crate 2019-10-18 06:02:23 -05:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Ghommie a57911b88a null lists type mismatch 2019-10-18 11:19:24 +02:00
Ghommie b96e8461a6 update 2019-10-18 11:13:16 +02:00
Ghommie 281f4e29dc Fixes some peculiarities with hands layer overlapping stuff 2019-10-18 10:23:43 +02:00
TrilbySpaceClone 1707d6e6d2 er? 2019-10-18 01:22:19 -04:00
TrilbySpaceClone 18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
Linzolle 5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
kevinz000 a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
Linzolle 380e5a2be7 Merge remote-tracking branch 'deco-wings/master' into wingcolors 2019-10-17 19:27:34 -05:00
Linzolle b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00
Linzolle 3b1e66ad05 more consistent naming 2019-10-17 17:23:47 -05:00
Linzolle 88814415dc tend wounds 2019-10-17 16:59:33 -05:00
kevinz000 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2019-10-17 13:23:33 -07:00
kevinz000 6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem
nerfs styptic/silversulf/synthflesh to have overdoses
2019-10-17 13:18:58 -07:00
kevinz000 1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
kevinz000 3e1120cd97 Merge pull request #9509 from Ghommie/Ghommie-cit239
properly blacklists space skeletons kek.
2019-10-17 13:11:05 -07:00
kevinz000 d2497a8ba1 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
2019-10-17 13:09:55 -07:00
kevinz000 1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon
Removes antimagic from holymelon
2019-10-17 13:07:40 -07:00
kevinz000 805fe2a91a Merge pull request #9496 from Ghommie/Ghommie-cit236
Removes the need of "_l" suffixes for digitigrade clothing on mob states
2019-10-17 13:06:17 -07:00
kevinz000 033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2019-10-17 13:05:15 -07:00
kevinz000 d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
2019-10-17 13:04:15 -07:00
kevinz000 8be030a931 Merge pull request #9482 from Thalpy/Wiki
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00