Commit Graph

15004 Commits

Author SHA1 Message Date
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212
Ensuring altdisarm() works as intended.
2019-10-03 20:16:05 -04:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes
Fixes AIs being unable to talk through holopads
2019-10-03 20:12:59 -04:00
BlackMajor
02f0e4dd84 Ghosts stop stealing my paper work 2019-10-03 19:16:00 +13:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
kevinz000
08ed166c08 Merge pull request #9365 from Ghommie/Ghommie-cit211
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
2019-10-02 00:06:13 -07:00
kevinz000
1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
2019-10-02 00:02:05 -07:00
kevinz000
af9336edde Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
2019-10-02 00:01:05 -07:00
kevinz000
a177e5a457 Merge pull request #9364 from Ghommie/Ghommie-cit206
Fixing the blood cult radial menu unholy flask option's icon.
2019-10-01 23:59:49 -07:00
Ghommie
d245a9d28d addendum 2019-10-02 00:42:19 +02:00
Ghommie
2a84162c59 incorrect number of macro arguments 2019-10-02 00:38:58 +02:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Ghommie
340f8498a3 Fixes some more issues with shoving people. 2019-10-01 22:11:41 +02:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
TrilbySpaceClone
3f893195bf tested! 2019-09-30 11:42:07 -04:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
Poojawa
30e6445c0a Suit Storage now purges radation contamination 2019-09-28 03:18:31 -05:00
Poojawa
041a4b4ed1 Corrects scanner measurment information 2019-09-28 03:18:00 -05:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
2019-09-28 00:40:02 -07:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
kevinz000
7c3036f027 Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
2019-09-28 00:28:43 -07:00
kevinz000
8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00
kevinz000
426104021e Merge pull request #9321 from Linzolle/bloodrites
some cult fixes + cult qol
2019-09-28 00:24:15 -07:00
kevinz000
6b33e3bd0b Merge pull request #9322 from Sishen1542/cult
blood cult conversion no longer requires consent
2019-09-28 00:23:48 -07:00
kevinz000
cbe6a54531 Merge pull request #9326 from YakumoChen/radioactive-paperweight
Advanced energy guns glow more
2019-09-28 00:23:31 -07:00
kevinz000
d7d4e3cbe2 Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-28 00:22:38 -07:00
kevinz000
cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-28 00:22:13 -07:00
kevinz000
3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
2019-09-28 00:21:47 -07:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
2019-09-28 00:20:42 -07:00
kevinz000
b28e65637e Merge pull request #9344 from Ghommie/Ghommie-cit208
Makes abandoned crates less prone to explosions.
2019-09-28 00:15:27 -07:00
kevinz000
1b295c8501 Merge pull request #9359 from deathride58/fuckstoredpower
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
2019-09-28 00:14:47 -07:00
Poojawa
ad9af65e73 lazily hijack the med hud update 2019-09-28 02:10:30 -05:00
Raptorizer
fe35a0d776 Projectiles increased to a proper number 2019-09-28 01:16:30 -05:00
Raptorizer
5607dff199 Update weapons.dm
Equalized the power of the melon seed.
2019-09-28 00:54:31 -05:00
Linzolle
0d3a2cdd57 cultist check 2019-09-27 19:15:19 -05:00
Ghommie
225b196b55 sure, let's fix the typo. 2019-09-27 22:14:51 +02:00
Ghommie
f820a95238 Fixing an issue with DNA scanners maintenance hatches. Also porting some sleepers code updates. 2019-09-27 22:01:23 +02:00
Ghommie
ce02f712ba tested. 2019-09-27 17:59:26 +02:00
Fermi
3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
Fermi
146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
nik707
3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs
Guardian/Holoparasite Buffs
2019-09-26 19:33:25 -07:00
kevinz000
06eb6e1537 Merge pull request #9318 from Thalpy/clingy-Chems
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
2019-09-26 19:31:58 -07:00
kevinz000
35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206
Blood cult altar, forge and archives now use radial menus.
2019-09-26 19:31:36 -07:00
kevinz000
428a34d0f4 Merge pull request #9348 from Ghommie/Ghommie-cit209
Reduces holy water message spam for blood/clock cultists.
2019-09-26 19:31:01 -07:00
deathride58
d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00