Commit Graph

26370 Commits

Author SHA1 Message Date
DeltaFire d0247bdb3b modifies heretic sac husking a bit
The husking caused by heretic sacrifices is not healable with synthflesh. In exchange, the sacrificed humanoid suffers 200 additional burn damage, making them ever so slightly harder to immediately restore.
2020-09-27 05:35:33 +02:00
ItzGabby b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
Putnam 9f871dfa17 Makes shivering and fever not broken. 2020-09-26 11:22:24 -07:00
Tupinambis cd5b108627 Alpha 2020-09-26 12:47:11 -05:00
DeltaFire 29d2a12d55 fixes revenants reviving
fix for issue #13166
2020-09-26 16:29:11 +02:00
Tupinambis 63c24e31b1 fixes a 5 year old hex value bug 2020-09-26 00:14:32 -05:00
timothyteakettle 04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
The0bserver 47ff98e4c5 Adds examine text, removes old self sustain checks 2020-09-25 18:12:26 -04:00
DeltaFire 178be2b643 fixes plushlings
This makes it so the snowflake id is actually set if the plush is a snowflake, and also makes plushlings not become invisible anymore if they absorb a snowflake plush
2020-09-25 23:41:18 +02:00
DeltaFire 07f50845b6 no more conditional invincibility 2020-09-25 23:24:00 +02:00
DeltaFire 0746116e17 fixes a bunch of blacksmithing stuff
the blacksmithing skill is now actually dwarfy instead of not because of a typo

picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.

you can't interact with anvils while they are already being worked to prevent issues.

Also fixes associative skill level code a tiny bit.
2020-09-25 22:04:55 +02:00
Mark9013100 bbf5c7f43e Merge branch 'master' into 09/22/20_engi_hazard_jumpsuits 2020-09-25 15:45:38 -04:00
Mark9013100 e4f9849cc3 Adds engineering hazard jumpsuits 2020-09-25 15:40:38 -04:00
Putnam 24c48c2bec Adds an "unstuck" step to LINDA 2020-09-25 09:40:32 -07:00
SiliconMain 84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
SiliconMain 4e5296438c Update tool_designs.dm 2020-09-25 09:46:11 -05:00
silicons 57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Putnam3145 f6d9d4b535 Merge pull request #13426 from CoreFlare/master
Gives IPCs hair.
2020-09-24 21:40:41 -07:00
EmeraldSundisk 079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
ffs
2020-09-24 19:18:50 -07:00
Timothy Teakettle 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
EmeraldSundisk 186f13f56c Revert "icon should work now I hope"
This reverts commit 179b9ba05d.
2020-09-24 09:38:26 -07:00
Putnam 6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
Putnam 650d76ba69 Fixed a dumb typo. 2020-09-23 22:36:12 -07:00
EmeraldSundisk 179b9ba05d icon should work now I hope 2020-09-23 21:49:26 -07:00
silicons 7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
2020-09-23 14:39:56 -07:00
Putnam3145 c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot
Fixes some statpanel Issues
2020-09-23 14:19:22 -07:00
CoreFlare 1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
Artur e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
Artur d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
Putnam e3e2cc7682 Actually properly unkludged it. 2020-09-23 06:41:03 -07:00
Putnam 1c99e59552 Makes cryo pods no longer replace already-won objectives. 2020-09-23 03:39:00 -07:00
silicons ee44cfc565 Update angel.dm 2020-09-22 22:06:11 -07:00
silicons 15d04caa43 okay 2020-09-22 21:59:33 -07:00
Blue Wildrose fe712d7e52 traviiiiiis 2020-09-22 20:14:14 -07:00
Blue Wildrose e920e2855c travis please 2020-09-22 19:23:18 -07:00
Blue Wildrose 3e8572e5e2 Requested by Teak because they didn't want to make a PR for this 2020-09-22 19:10:24 -07:00
MrJWhit 028b91e77d Update robot.dm 2020-09-22 21:15:50 -04:00
silicons 731bab4bc9 Update angel.dm 2020-09-22 16:20:47 -07:00
silicons b3f145de10 Update species.dm 2020-09-22 16:20:13 -07:00
raspy-on-osu 87d65d5c58 init 2020-09-22 15:11:46 -04:00
Neko Boi Nick 6c8988c89c Light replacer can print at Engineering 2020-09-22 10:42:56 -07:00
silicons ed9cc1e383 Update mobs.dm 2020-09-22 05:22:08 -07:00
silicons 5e355dafe8 Update mecha_defense.dm 2020-09-22 04:39:43 -07:00
silicons 60a299197b Update mecha_defense.dm 2020-09-22 04:38:47 -07:00
Blue Wildrose 006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
silicons 9a17c42321 sigh 2020-09-22 01:53:16 -07:00
Putnam 2e877b8c50 Hardcoded fusion scan results as "fusion" to fix a runtime.
It didn't need to be id anyway??
2020-09-22 00:23:13 -07:00
silicons 2dddb2253e tweak 2020-09-21 21:03:28 -07:00
silicons 4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons 31791df2bd fixes 2020-09-21 20:38:43 -07:00