mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 05:07:51 +01:00
Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
Adds permanent markers
This commit is contained in:
Atermonera
@@ -39,6 +39,7 @@
|
||||
name = "Arts and Crafts supplies"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/fancy/crayons,
|
||||
/obj/item/weapon/storage/fancy/markers,
|
||||
/obj/item/device/camera,
|
||||
/obj/item/device/camera_film = 2,
|
||||
/obj/item/weapon/storage/photo_album,
|
||||
|
||||
@@ -46,11 +46,11 @@
|
||||
if(colour != "#FFFFFF" && shadeColour != "#000000")
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
user << "You will now draw in white and black with this crayon."
|
||||
to_chat(usr,"You will now draw in white and black with this crayon.")
|
||||
else
|
||||
colour = "#000000"
|
||||
shadeColour = "#FFFFFF"
|
||||
user << "You will now draw in black and white with this crayon."
|
||||
to_chat(usr,"You will now draw in black and white with this crayon.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/rainbow
|
||||
@@ -72,22 +72,22 @@
|
||||
switch(drawtype)
|
||||
if("letter")
|
||||
drawtype = input("Choose the letter.", "Crayon scribbles") in list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
|
||||
user << "You start drawing a letter on the [target.name]."
|
||||
to_chat(usr,"You start drawing a letter on the [target.name].")
|
||||
if("graffiti")
|
||||
user << "You start drawing graffiti on the [target.name]."
|
||||
to_chat(usr,"You start drawing graffiti on the [target.name].")
|
||||
if("rune")
|
||||
user << "You start drawing a rune on the [target.name]."
|
||||
to_chat(usr,"You start drawing a rune on the [target.name].")
|
||||
if("arrow")
|
||||
drawtype = input("Choose the arrow.", "Crayon scribbles") in list("left", "right", "up", "down")
|
||||
user << "You start drawing an arrow on the [target.name]."
|
||||
to_chat(usr,"You start drawing an arrow on the [target.name].")
|
||||
if(instant || do_after(user, 50))
|
||||
new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
|
||||
user << "You finish drawing."
|
||||
to_chat(usr,"You finish drawing.")
|
||||
target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on.
|
||||
if(uses)
|
||||
uses--
|
||||
if(!uses)
|
||||
user << "<span class='warning'>You used up your crayon!</span>"
|
||||
to_chat(usr,"<span class='warning'>You used up your crayon!</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
@@ -99,7 +99,93 @@
|
||||
if(uses)
|
||||
uses -= 5
|
||||
if(uses <= 0)
|
||||
user << "<span class='warning'>You ate your crayon!</span>"
|
||||
to_chat(user,"<span class='warning'>You ate your crayon!</span>")
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/black
|
||||
icon_state = "markerblack"
|
||||
colour = "#2D2D2D"
|
||||
shadeColour = "#000000"
|
||||
colourName = "black"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/red
|
||||
icon_state = "markerred"
|
||||
colour = "#DA0000"
|
||||
shadeColour = "#810C0C"
|
||||
colourName = "red"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/orange
|
||||
icon_state = "markerorange"
|
||||
colour = "#FF9300"
|
||||
shadeColour = "#A55403"
|
||||
colourName = "orange"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/yellow
|
||||
icon_state = "markeryellow"
|
||||
colour = "#FFF200"
|
||||
shadeColour = "#886422"
|
||||
colourName = "yellow"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/green
|
||||
icon_state = "markergreen"
|
||||
colour = "#A8E61D"
|
||||
shadeColour = "#61840F"
|
||||
colourName = "green"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/blue
|
||||
icon_state = "markerblue"
|
||||
colour = "#00B7EF"
|
||||
shadeColour = "#0082A8"
|
||||
colourName = "blue"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/purple
|
||||
icon_state = "markerpurple"
|
||||
colour = "#DA00FF"
|
||||
shadeColour = "#810CFF"
|
||||
colourName = "purple"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/mime
|
||||
icon_state = "markermime"
|
||||
desc = "A very sad-looking marker."
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
colourName = "mime"
|
||||
uses = 0
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/mime/attack_self(mob/living/user as mob) //inversion
|
||||
if(colour != "#FFFFFF" && shadeColour != "#000000")
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
to_chat(usr,"You will now draw in white and black with this marker.")
|
||||
else
|
||||
colour = "#000000"
|
||||
shadeColour = "#FFFFFF"
|
||||
to_chat(usr,"You will now draw in black and white with this marker.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/rainbow
|
||||
icon_state = "markerrainbow"
|
||||
colour = "#FFF000"
|
||||
shadeColour = "#000FFF"
|
||||
colourName = "rainbow"
|
||||
uses = 0
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/rainbow/attack_self(mob/living/user as mob)
|
||||
colour = input(user, "Please select the main colour.", "Marker colour") as color
|
||||
shadeColour = input(user, "Please select the shade colour.", "Marker colour") as color
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/attack(mob/M as mob, mob/user as mob)
|
||||
if(M == user)
|
||||
to_chat(usr,"You take a bite of the marker and swallow it.")
|
||||
user.nutrition += 1
|
||||
user.reagents.add_reagent("marker_ink",6)
|
||||
if(uses)
|
||||
uses -= 5
|
||||
if(uses <= 0)
|
||||
to_chat(user,"<span class='warning'>You ate the marker!</span>")
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
@@ -114,6 +114,48 @@
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers
|
||||
name = "box of markers"
|
||||
desc = "A very professional looking box of permanent markers."
|
||||
icon = 'icons/obj/crayons.dmi'
|
||||
icon_state = "markerbox"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
icon_type = "marker"
|
||||
can_hold = list(
|
||||
/obj/item/weapon/pen/crayon/marker
|
||||
)
|
||||
starts_with = list(
|
||||
/obj/item/weapon/pen/crayon/marker/black,
|
||||
/obj/item/weapon/pen/crayon/marker/red,
|
||||
/obj/item/weapon/pen/crayon/marker/orange,
|
||||
/obj/item/weapon/pen/crayon/marker/yellow,
|
||||
/obj/item/weapon/pen/crayon/marker/green,
|
||||
/obj/item/weapon/pen/crayon/marker/blue,
|
||||
/obj/item/weapon/pen/crayon/marker/purple
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers/initialize()
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers/update_icon()
|
||||
var/mutable_appearance/ma = new(src)
|
||||
ma.overlays = list()
|
||||
for(var/obj/item/weapon/pen/crayon/marker/marker in contents)
|
||||
ma.overlays += image('icons/obj/crayons.dmi',"m"+marker.colourName)
|
||||
appearance = ma
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers/attackby(obj/item/W as obj, mob/user as mob)
|
||||
if(istype(W,/obj/item/weapon/pen/crayon/marker))
|
||||
switch(W:colourName)
|
||||
if("mime")
|
||||
to_chat(usr,"This marker is too depressing to be contained in this box.")
|
||||
return
|
||||
if("rainbow")
|
||||
to_chat(usr,"This marker is too childish to be contained in this box.")
|
||||
return
|
||||
..()
|
||||
|
||||
////////////
|
||||
//CIG PACK//
|
||||
////////////
|
||||
@@ -259,7 +301,8 @@
|
||||
icon_state = "paperbox"
|
||||
icon = 'icons/obj/cigarettes.dmi'
|
||||
w_class = ITEMSIZE_TINY
|
||||
throwforce = 1
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
storage_slots = 14
|
||||
can_hold = list(/obj/item/weapon/rollingpaper)
|
||||
starts_with = list(/obj/item/weapon/rollingpaper = 14)
|
||||
|
||||
@@ -184,11 +184,18 @@
|
||||
var/instant = 0
|
||||
var/colourName = "red" //for updateIcon purposes
|
||||
|
||||
suicide_act(mob/user)
|
||||
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
|
||||
viewers(user) << "<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>"
|
||||
return (BRUTELOSS|OXYLOSS)
|
||||
/obj/item/weapon/pen/crayon/suicide_act(mob/user)
|
||||
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
|
||||
viewers(user) << "<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>"
|
||||
return (BRUTELOSS|OXYLOSS)
|
||||
|
||||
New()
|
||||
name = "[colourName] crayon"
|
||||
..()
|
||||
/obj/item/weapon/pen/crayon/New()
|
||||
name = "[colourName] crayon"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker
|
||||
name = "marker"
|
||||
desc = "A chisel-tip permanent marker. Hopefully non-toxic."
|
||||
icon_state = "markerred"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/New()
|
||||
name = "[colourName] marker"
|
||||
|
||||
@@ -49,6 +49,60 @@
|
||||
id = "crayon_dust_brown"
|
||||
color = "#846F35"
|
||||
|
||||
/datum/reagent/marker_ink
|
||||
name = "Marker ink"
|
||||
id = "marker_ink"
|
||||
description = "Intensely coloured ink used in markers."
|
||||
taste_description = "extremely bitter"
|
||||
reagent_state = LIQUID
|
||||
color = "#888888"
|
||||
overdose = 5
|
||||
|
||||
/datum/reagent/marker_ink/black
|
||||
name = "Black marker ink"
|
||||
id = "marker_ink_black"
|
||||
color = "#000000"
|
||||
|
||||
/datum/reagent/marker_ink/red
|
||||
name = "Red marker ink"
|
||||
id = "marker_ink_red"
|
||||
color = "#FE191A"
|
||||
|
||||
/datum/reagent/marker_ink/orange
|
||||
name = "Orange marker ink"
|
||||
id = "marker_ink_orange"
|
||||
color = "#FFBE4F"
|
||||
|
||||
/datum/reagent/marker_ink/yellow
|
||||
name = "Yellow marker ink"
|
||||
id = "marker_ink_yellow"
|
||||
color = "#FDFE7D"
|
||||
|
||||
/datum/reagent/marker_ink/green
|
||||
name = "Green marker ink"
|
||||
id = "marker_ink_green"
|
||||
color = "#18A31A"
|
||||
|
||||
/datum/reagent/marker_ink/blue
|
||||
name = "Blue marker ink"
|
||||
id = "marker_ink_blue"
|
||||
color = "#247CFF"
|
||||
|
||||
/datum/reagent/marker_ink/purple
|
||||
name = "Purple marker ink"
|
||||
id = "marker_ink_purple"
|
||||
color = "#CC0099"
|
||||
|
||||
/datum/reagent/marker_ink/grey //Mime
|
||||
name = "Grey marker ink"
|
||||
id = "marker_ink_grey"
|
||||
color = "#808080"
|
||||
|
||||
/datum/reagent/marker_ink/brown //Rainbow
|
||||
name = "Brown marker ink"
|
||||
id = "marker_ink_brown"
|
||||
color = "#846F35"
|
||||
|
||||
/datum/reagent/paint
|
||||
name = "Paint"
|
||||
id = "paint"
|
||||
|
||||
@@ -876,7 +876,7 @@
|
||||
name = "Red paint"
|
||||
id = "red_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_red" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/red_paint/send_data()
|
||||
@@ -886,7 +886,7 @@
|
||||
name = "Orange paint"
|
||||
id = "orange_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_orange" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/orange_paint/send_data()
|
||||
@@ -896,7 +896,7 @@
|
||||
name = "Yellow paint"
|
||||
id = "yellow_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_yellow" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/yellow_paint/send_data()
|
||||
@@ -906,7 +906,7 @@
|
||||
name = "Green paint"
|
||||
id = "green_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_green" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/green_paint/send_data()
|
||||
@@ -916,7 +916,7 @@
|
||||
name = "Blue paint"
|
||||
id = "blue_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_blue" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/blue_paint/send_data()
|
||||
@@ -926,7 +926,7 @@
|
||||
name = "Purple paint"
|
||||
id = "purple_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_purple" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/purple_paint/send_data()
|
||||
@@ -936,7 +936,7 @@
|
||||
name = "Grey paint"
|
||||
id = "grey_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_grey" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/grey_paint/send_data()
|
||||
@@ -946,7 +946,7 @@
|
||||
name = "Brown paint"
|
||||
id = "brown_paint"
|
||||
result = "paint"
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1)
|
||||
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_brown" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/brown_paint/send_data()
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
################################
|
||||
# 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
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: battlefieldCommander
|
||||
|
||||
# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Added permanent markers, an alternative to crayons."
|
||||
- tweak: "The chemistry recipe for paint now uses marker ink instead of crayon dust."
|
||||
- rscdel: "Removed crayon boxes from the map. They can still be ordered from cargo in case you need a snack."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 732 B After Width: | Height: | Size: 5.0 KiB |
@@ -298,7 +298,7 @@
|
||||
"afL" = (/turf/simulated/wall,/area/chapel/main)
|
||||
"afM" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/machinery/camera/network/civilian{c_tag = "CIV - Chapel Office"; dir = 4},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"afN" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen/blue{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"afO" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/fancy/crayons,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"afO" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/storage/fancy/markers,/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"afP" = (/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"afQ" = (/obj/structure/closet/wardrobe/chaplain_black,/obj/machinery/light{dir = 4},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"afR" = (/obj/machinery/light/small{dir = 8},/obj/item/weapon/storage/bible,/obj/structure/table/rack,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/locker)
|
||||
@@ -1821,7 +1821,7 @@
|
||||
"aJa" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/belt/utility,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard)
|
||||
"aJb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/security_starboard)
|
||||
"aJc" = (/turf/simulated/wall,/area/storage/art)
|
||||
"aJd" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/turf/simulated/floor/tiled,/area/storage/art)
|
||||
"aJd" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/markers,/obj/item/weapon/storage/fancy/markers,/turf/simulated/floor/tiled,/area/storage/art)
|
||||
"aJe" = (/obj/structure/table/standard,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/turf/simulated/floor/tiled,/area/storage/art)
|
||||
"aJf" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/item/weapon/hand_labeler,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/storage/art)
|
||||
"aJg" = (/obj/structure/table/standard,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/device/taperecorder,/obj/item/device/taperecorder,/turf/simulated/floor/tiled,/area/storage/art)
|
||||
|
||||
@@ -3981,7 +3981,7 @@
|
||||
"byC" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/purple/border{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/janitor)
|
||||
"byD" = (/obj/structure/closet/toolcloset,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/yellow/border{dir = 8},/turf/simulated/floor/tiled,/area/storage/auxillary)
|
||||
"byE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/table/steel,/obj/random/maintenance/engineering,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/storage/auxillary)
|
||||
"byF" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/obj/machinery/camera/network/civilian{c_tag = "CIV - Auxiliary Storage"; dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/turf/simulated/floor/tiled,/area/storage/auxillary)
|
||||
"byF" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/obj/machinery/camera/network/civilian{c_tag = "CIV - Auxiliary Storage"; dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/item/weapon/storage/fancy/markers,/obj/item/weapon/storage/fancy/markers,/turf/simulated/floor/tiled,/area/storage/auxillary)
|
||||
"byG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"; tag = "icon-manifold-f (WEST)"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/meter,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/research)
|
||||
"byH" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Firefighting Equipment"; req_access = null; req_one_access = list(12,47)},/turf/simulated/floor/plating,/area/maintenance/research)
|
||||
"byI" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/maintenance/research)
|
||||
@@ -8505,7 +8505,7 @@
|
||||
"dhC" = (/obj/machinery/photocopier,/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"dhD" = (/obj/structure/table/wooden_reinforced,/obj/structure/flora/pottedplant/thinbush{pixel_y = 10},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"dhE" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/nullrod,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/button/windowtint{id = "chapel"; pixel_x = -11; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"dhF" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/fancy/crayons,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"dhF" = (/obj/structure/table/wooden_reinforced,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/item/weapon/storage/fancy/markers,/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"dhG" = (/obj/structure/closet/wardrobe/chaplain_black,/turf/simulated/floor/lino,/area/chapel/office)
|
||||
"dhH" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Civilian Substation Bypass"},/turf/simulated/floor/plating,/area/maintenance/substation/civilian)
|
||||
"dhI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/substation/civilian)
|
||||
|
||||
Reference in New Issue
Block a user