Skip to content

Commit 2ba07df

Browse files
Fixed the kitchen's first-aid closet having non-first aid items (#20776)
The first aid closet in the kitchen will no longer attempt to rub salt into your wounds while you scramble around for bandages. The game would think that the soy sauce bottles and plant were meant to spawn inside the first-aid cabinet, leading to an amusing surprise whenever you went for the first aid kit. I moved the soy sauce bottles to the fridge, and deleted the potted plant that sometimes spawns on that counter.
1 parent 6584089 commit 2ba07df

File tree

2 files changed

+60
-14
lines changed

2 files changed

+60
-14
lines changed
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
################################
2+
# Example Changelog File
3+
#
4+
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
5+
#
6+
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
7+
# When it is, any changes listed below will disappear.
8+
#
9+
# Valid Prefixes:
10+
# bugfix
11+
# - (fixes bugs)
12+
# wip
13+
# - (work in progress)
14+
# qol
15+
# - (quality of life)
16+
# soundadd
17+
# - (adds a sound)
18+
# sounddel
19+
# - (removes a sound)
20+
# rscadd
21+
# - (adds a feature)
22+
# rscdel
23+
# - (removes a feature)
24+
# imageadd
25+
# - (adds an image or sprite)
26+
# imagedel
27+
# - (removes an image or sprite)
28+
# spellcheck
29+
# - (fixes spelling or grammar)
30+
# experiment
31+
# - (experimental change)
32+
# balance
33+
# - (balance changes)
34+
# code_imp
35+
# - (misc internal code change)
36+
# refactor
37+
# - (refactors code)
38+
# config
39+
# - (makes a change to the config files)
40+
# admin
41+
# - (makes changes to administrator tools)
42+
# server
43+
# - (miscellaneous changes to server)
44+
#################################
45+
46+
# Your name.
47+
author: ASmallCuteCat
48+
49+
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
50+
delete-after: True
51+
52+
# Any changes you've made. See valid prefix list above.
53+
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
54+
# SCREW THIS UP AND IT WON'T WORK.
55+
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
56+
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
57+
changes:
58+
- bugfix: "The kitchen's first aid closet should no longer have non-first aid items in it. Soy sauce bottles were moved to the fridge, potted plant has been removed."

maps/sccv_horizon/sccv_horizon.dmm

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48662,6 +48662,8 @@
4866248662
/obj/effect/floor_decal/industrial/outline/grey,
4866348663
/obj/item/reagent_containers/food/drinks/carton/cream,
4866448664
/obj/item/reagent_containers/food/drinks/carton/cream,
48665+
/obj/item/reagent_containers/food/condiment/soysauce,
48666+
/obj/item/reagent_containers/food/condiment/soysauce,
4866548667
/turf/simulated/floor/tiled/dark/full,
4866648668
/area/horizon/kitchen)
4866748669
"gTq" = (
@@ -81619,23 +81621,9 @@
8161981621
departmentType = 1;
8162081622
name = "Kitchen Requests Console"
8162181623
},
81622-
/obj/random/pottedplant_small{
81623-
spawn_nothing_percentage = 25;
81624-
name = "random potted plant, small (25% nothing)";
81625-
pixel_y = -2;
81626-
pixel_x = 7
81627-
},
8162881624
/obj/structure/closet/walllocker/medical/firstaid{
8162981625
pixel_y = -32
8163081626
},
81631-
/obj/item/reagent_containers/food/condiment/soysauce{
81632-
pixel_y = 1;
81633-
pixel_x = -16
81634-
},
81635-
/obj/item/reagent_containers/food/condiment/soysauce{
81636-
pixel_y = 1;
81637-
pixel_x = -7
81638-
},
8163981627
/turf/simulated/floor/tiled/dark/full,
8164081628
/area/horizon/kitchen)
8164181629
"lIW" = (

0 commit comments

Comments
 (0)