Commit Graph

38476 Commits

Author SHA1 Message Date
Novacat
2e3dbdfa9a Update life.dm 2020-07-30 15:33:47 -04:00
Novacat
057b9fba16 Update life.dm 2020-07-30 15:32:15 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Novacat
daa3307d25 Merge pull request #8534 from VOREStation/upstream-merge-7350
[MIRROR] Relatively small changes to how damage affects mechs.
2020-07-30 15:05:34 -04:00
Novacat
e7237fda14 Merge pull request #8530 from Rykka-Stormheart/shep-dev-chilly-freezers
Freezers are chilly!
2020-07-30 15:04:52 -04:00
Novacat
9578296ca5 Merge pull request #8535 from VOREStation/upstream-merge-7352
[MIRROR] Increase mob default reload time from 1 second to 4 seconds.
2020-07-30 15:03:12 -04:00
Novacat
216a8d8c12 Merge pull request #8533 from VOREStation/upstream-merge-7345
[MIRROR] custom_sprites.dm small improvement and better commenting.
2020-07-30 14:53:48 -04:00
Novacat
38e4cbd3e9 Merge pull request #8532 from Cyantime/patch-2
Allows some protean ventcrawl accessories
2020-07-30 14:53:25 -04:00
Novacat
d68f0ece6a Update mecha.dm 2020-07-30 14:52:28 -04:00
Atermonera
f63d2c4506 Merge pull request #7352 from lbnesquik/Kot-Mob-Tweak
Increase mob default reload time from 1 second to 4 seconds.
2020-07-30 14:46:19 -04:00
Atermonera
142f0c253f Relatively small changes to how damage affects mechs. 2020-07-30 14:45:01 -04:00
Atermonera
cb31910225 Merge pull request #7345 from LunarFleet/Lun-Sprite
custom_sprites.dm small improvement and better commenting.
2020-07-30 14:41:39 -04:00
Novacat
c81eae8191 Merge pull request #8531 from lbnesquik/Kot-Stuff-Cyborg
Add a little message for once you are done refilling some water as a dogborg.
2020-07-30 14:33:17 -04:00
Cyantime
120483c41c Allows some protean ventcrawl accessories 2020-07-30 14:30:58 -04:00
lbnesquik
e962474fc5 Add a little message for once you are done refilling some water as a dogborg. 2020-07-30 19:41:18 +02:00
Rykka
5e0b45cfe1 Freezers are chilly!
Freezers will start at T0C - 5 (Which is effectively 268.15), and a new Freezer air alarm subtype has been added that bypasses the TLV hardcoded default to allow for larger cooling thresholds (and allow lower target temps).

TL;DR: Freezer tiles and the kitchen freezer will start cold and actually stay cold, prompting "you feel chilly" in the freezer. Other areas that use /freezer/ tiles may be affected by the initial temp, but this should quickly resolve itself thanks to heat balancing.
2020-07-30 13:01:08 -04:00
Verkister
744fb20b4a Fixes some trait stats requiring set_species
Moves a couple trait stats applied via set_species proc to somewhere custom species can actually access them.
Mostly just affects motion based hunger factor, and would also affect health traits but those already have their own bandaid application.
2020-07-30 11:28:02 +03:00
Killian
bf842ed57a cleanup crew deployment authorized 2020-07-30 05:27:58 +01:00
Novacat
07f481388a Merge pull request #8527 from ShadowLarkens/adv_med_pass2
Fix a few things about the body scanner
2020-07-29 23:48:15 -04:00
ShadowLarkens
da74167d27 Fix a few things about the body scanner 2020-07-29 20:29:24 -07:00
ShadowLarkens
7f2952bd90 Fix medhuds/sechuds and stuff showing on the camera monitor improperly 2020-07-29 19:03:33 -07:00
Novacat
9689b7a3df Merge pull request #8523 from Novacat/nova-basicfixes
Reverts vorestation edit to large crate
2020-07-29 20:44:22 -04:00
Unknown
f4398a4f89 Reverts vorestation edit to large crate
Fixes invisible crates.
2020-07-29 20:32:44 -04:00
DESKTOP-4BUBN9N\Mike
4f2f60e4bc vr file makes more sense also added comment separator 2020-07-29 22:03:05 +01:00
DESKTOP-4BUBN9N\Mike
438c1e600b adds cool and good new drink recipe 2020-07-29 21:33:08 +01:00
Novacat
ca022164bb Merge pull request #8520 from TeleTubby2/MlemWax
Makes sterilizine actually useful.
2020-07-29 15:09:07 -04:00
Teletubby2
3a367e20fb More reasonable value.
200 steps to see dirt again is a bit excessive.
2020-07-29 15:07:00 -03:00
Novacat
dd52bc19af Merge pull request #8515 from Rykka-Stormheart/shep-dev-flat-dough
Fix for flatbread/tortilla recipe conflict, and missing trash icons
2020-07-29 06:58:14 -04:00
Rykka
ca3aa318b0 Fix Adv Med Printout 2020-07-29 06:22:09 -04:00
ShadowLarkens
9f8123cbb7 Make sleever error messages more consistent and obvious 2020-07-28 17:58:54 -07:00
Rykka
bd5d102a35 Fix for duplicate tortilla recipe and flatbread/tortilla recipe conflict 2020-07-28 12:07:16 -04:00
Rykka
a34bb589d1 Massive Map/Bugfix 2020-07-28 10:33:56 -04:00
Novacat
7d9305da76 Merge pull request #8508 from ShadowLarkens/patch-1
Revert unintentional nerf to sleepers
2020-07-28 05:03:29 -04:00
ShadowLarkens
4f2bb7bc34 Fix ghosts being unable to interact with TGUI by default 2020-07-28 01:16:00 -07:00
ShadowLarkens
fe597f18dc Revert unintentional nerf to sleepers
Whoops. Swore I read a -25 health limitation to injecting people before TGUI, but that wasn't the case. This fixes a bug introduced by #8471
2020-07-28 00:01:41 -07:00
Rykka
0800f05c31 Fix for Camera interaction for Borgs/Drones.
To note - the original change was intentional change on Paradise/Polaris's part.

"You might not have been able to actually view the cameras, but you should have been able to open the interface."
2020-07-27 05:28:17 -04:00
Novacat
c4f7aed7f4 Merge pull request #8215 from dwinters99/spellcheck
Minor typo fixes
2020-07-27 01:55:24 -04:00
Novacat
9e72efca03 Update clothing.dm 2020-07-27 01:43:56 -04:00
lbnesquik
2834a0b9c6 Correct a typo with the smelling ability. 2020-07-27 05:27:06 +02:00
Novacat
2a8d652cc0 Merge pull request #8493 from ShadowLarkens/weh
Fix engineering camera consoles seeing all cameras
2020-07-26 23:14:36 -04:00
ShadowLarkens
121a711265 Fix camera consoles being broke as fuck 2020-07-26 19:52:03 -07:00
Rykka
15da4a522f Rename Alcoholic Version of Love Potion to The Love Maker
Should prevent the alcoholic version of Love Potion appearing fucking everywhere.
2020-07-26 20:29:10 -04:00
Cyantime
5eefadf78b Update netgun design name 2020-07-26 17:06:57 -04:00
Novacat
344d5cb77a Merge pull request #8486 from Rykka-Stormheart/shep-dev-nutri-spread
Fix for Nutrispread not being available and Alternative Method for UE
2020-07-26 08:33:02 -04:00
Rykka
453715bfb3 Fix for Nutrispread not being available and Alternative Method for UE
Allows you to get Universal Enzymes via the Biogenerator and Nutri-spread from the biogenerator.

Re-color-codes the biogenerator menu.
2020-07-26 08:05:53 -04:00
Novacat
5701af8b95 Update medbot.dm 2020-07-26 01:58:53 -04:00
Atermonera
c1638aa7b8 Fix scrubbers 2020-07-26 01:57:38 -04:00
Novacat
c14a7ea7b1 Merge pull request #8483 from Rykka-Stormheart/shep-dev-batter-fix
Fix batter and all subtypes of it being unmake-able.
2020-07-26 01:18:59 -04:00
Rykka
f18c8bfa0a Fix batter and all subtypes of it being unmake-able.
Add water or beer BEFORE adding egg + flour together to avoid messing it up.
2020-07-26 00:17:27 -04:00
Rykka
84d9798802 Medibot Interaction Hotfix
Always check that you're passing the arguments a proc needs.

In this case, I was calling interact(), but not giving it a mob to interact with. Whoops.
2020-07-25 23:09:09 -04:00