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
Teletubby2
63b9a13124
Makes sterilizine actually do something worthwhile.
...
Hnnnnnnng. if floor code wasn't ass I'd give this it's own overlay, but it's fine. probably. the reason I'm not throwing this at Polaris is because I can't be assed forking them with my junky, canadian internet.
2020-07-25 21:42:49 -03:00
Novacat
e64b2a27cc
Merge pull request #8471 from ShadowLarkens/tgui_med
...
Medical TGUI
2020-07-25 14:54:45 -04:00
Novacat
57b5a9cace
Merge pull request #8474 from SweetBlueSylveon/service-bock-fix
...
Service Remap tweak
2020-07-25 11:18:13 -04:00
SweetBlueSylveon
ee60a1b717
Fixes a large number of issues brought up.
...
Fixes the roof for surface med.
Adds lights.
Changes the hallway disposals to a bin in the entertainment room.
Gives clowns entertainment access.
Fixes a pipe's visibility.
Adds shutter and tint control buttons where they were missing.
No the I'm not moving the goat he's my friend and he's staying in the freezer.
2020-07-25 05:23:15 -07:00
Verkister
82b08a5266
Earlyports table/bench fix
...
Polaris being slow
2020-07-25 11:27:29 +03:00
ShadowLarkens
2579579fd1
TGUI'ified Medical Everything
...
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!
ParadiseSS13/Paradise#13738
2020-07-25 00:44:51 -07:00
ShadowLarkens
c2618c0e66
Merge remote-tracking branch 'upstream/master' into tgui_wires
...
# Conflicts:
# code/__defines/misc.dm
2020-07-24 17:06:18 -07:00
Verkister
6f5c5ddf33
Earlyports melee exploit fix
...
*incoherent groaning*
2020-07-24 18:26:19 +03:00
Novacat
61314af7a1
Merge pull request #8463 from Rykka-Stormheart/shep-dev-null-reagent-fix
...
Null R.Type fix and Fortune Cookie Fix
2020-07-24 11:17:43 -04:00
Rykka
04024ad472
Null R.Type fix and Fortune Cookie Fix
...
Fortune Cookies had special weird-as-shit code to handle leaving a piece of paper behind, and therefore just getting rid of the special-code seems the best option.
R.type is actually R.id on our codebase, so that was causing runtimes. This fixes those runtimes.
Also removes duplicate recipes from microwave.dm, and fixes the issue with recipes returning burnt mess.
2020-07-24 10:05:39 -04:00
Novacat
8428de3dd4
Merge pull request #8461 from VOREStation/upstream-merge-7337
...
[MIRROR] Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 09:22:33 -04:00
Novacat
5c120cd547
Merge pull request #8408 from VOREStation/upstream-merge-7334
...
[MIRROR] Reorganized Library Computer Menu
2020-07-24 09:09:00 -04:00
Unknown
c4476fc51c
Why is this still here
2020-07-24 09:08:18 -04:00
Unknown
5d7afad7c3
Conflict Resolution
2020-07-24 09:07:41 -04:00
Novacat
0e2e0db5cb
Update lib_machines.dm
2020-07-24 08:55:11 -04:00
Novacat
a940d19a13
Update material_recipes.dm
2020-07-24 08:43:34 -04:00
Cerebulon
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
Rykka
2791419c98
Add Grill to Sorting List, Sort List by Appliance
2020-07-23 23:43:41 -04:00
