Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Research Chemistry Lab Additions #20364

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Research Chemistry Lab Additions #20364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions html/changelogs/furrycactus - research chem additions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# 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.
#
# 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.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Furrycactus

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# 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.
changes:
- rscadd: "Added a chemistry equipment locker to the Research chemistry lab, to allow for easier storage, transport, and testing of any produced substances."
- rscadd: "Added two large beakers to the Research chemistry lab."
40 changes: 25 additions & 15 deletions maps/sccv_horizon/sccv_horizon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16294,6 +16294,26 @@
/obj/effect/floor_decal/corner/mauve{
dir = 10
},
/obj/structure/closet/crate/drop/grey{
desc = "A large, sturdy crate, that stores grenade components.";
name = "grenade crate";
pixel_y = -4;
tablestatus = -1
},
/obj/item/storage/box/syringegun,
/obj/item/gun/launcher/syringe,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry)
"cmr" = (
Expand Down Expand Up @@ -46798,6 +46818,7 @@
/obj/structure/table/standard,
/obj/item/storage/box/fancy/vials,
/obj/item/reagent_containers/dropper/electronic_pipette,
/obj/item/reagent_containers/glass/beaker/large,
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry)
"gKx" = (
Expand Down Expand Up @@ -137125,6 +137146,7 @@
/obj/item/storage/box/fancy/vials,
/obj/item/reagent_containers/dropper/electronic_pipette,
/obj/effect/floor_decal/corner/mauve/full,
/obj/item/reagent_containers/glass/beaker/large,
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry)
"tZn" = (
Expand Down Expand Up @@ -148279,28 +148301,16 @@
/turf/simulated/floor/tiled/dark/full,
/area/assembly/chargebay)
"vFA" = (
/obj/structure/closet/crate,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/gun/launcher/syringe,
/obj/item/storage/box/syringegun,
/obj/machinery/light{
dir = 4
},
/obj/effect/floor_decal/corner/mauve{
dir = 6
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/secure_closet/chemical{
req_access = list(7)
},
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry)
"vFD" = (
Expand Down
Loading