Medbay Re-work, gunless vendors

Moves Ballestics guns from vendors to equipment area in front of armoury (Still for officer's use.)
Reworks like. Most of medbay. (I pulled my hair out for you hawk. Love me ;-;)
Most important feature: Emotional support Corgi named Mister Wiggles.
This commit is contained in:
RadiantFlash7
2020-01-25 01:23:16 -05:00
parent 5f58f95f13
commit 2931d08ffe
10 changed files with 53706 additions and 50966 deletions

View File

@@ -30,7 +30,7 @@
icon_deny = "sec-deny"
req_access = list(access_security)
products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6,/obj/item/weapon/gun/energy/taser =3,/obj/item/weapon/gun/projectile/sec =3)
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/box/donut = 2)
req_log_access = access_armory
has_logs = 1

View File

@@ -107,6 +107,11 @@
name = "Bockscar"
real_name = "Bockscar"
/mob/living/simple_mob/animal/passive/dog/corgi/puppy/wiggle //yw addition
name = "Mister Wiggles"
real_name = "Mister Wiggles"
desc = "An emotional support corgi! He gets along with everyone, even Runtime."
//IAN! SQUEEEEEEEEE~
/mob/living/simple_mob/animal/passive/dog/corgi/Ian
name = "Ian"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1940,7 +1940,7 @@
"Lp" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room)
"Lq" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_y = 6},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room)
"Lr" = (/obj/structure/table/standard,/obj/item/bodybag/cryobag,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay)
"Ls" = (/obj/structure/table/standard,/obj/item/roller{pixel_x = 2; pixel_y = 3},/obj/item/roller,/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay)
"Ls" = (/obj/structure/table/standard,/obj/item/roller{pixel_x = 2; pixel_y = 3},/obj/item/roller,/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/item/device/radio/phone/medbay,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay)
"Lt" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay)
"Lu" = (/obj/machinery/sleep_console,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay)
"Lv" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/camera/network/mining{c_tag = "OPM - Mining Hallway Mid"; dir = 4},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -365,6 +365,12 @@
/area/medical/pyschwarde
name = "\improper Psychiatric lockup"
icon_state = "medbay2"
/area/medical/triage
name = "\improper Medbay Triage"
icon_state = "medbay4"
/area/medical/scanning
name = "Medical Diagnostics Center"
icon_state = "medbay"
//Science outpost

View File

@@ -332,6 +332,16 @@ var/global/list/latejoin_tram = list()
return ..(user)
/obj/machinery/door/airlock/highsecurity/red
name = "Bridge Holdout Armory"
desc = "Only to be opened on Code red or greater."
/obj/machinery/door/airlock/highsecurity/red/allowed(mob/user)
if(get_security_level() in list("green","blue"))
return FALSE
return ..(user)
//Freezable Airlock Door
/obj/machinery/door/airlock/glass_external/freezable
maxhealth = 600

View File

@@ -21,6 +21,7 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/floor/outdoors/snow/gravsnow)
CRYOGAIA_TURF_CREATE(/turf/simulated/floor/outdoors/snow/plating)
CRYOGAIA_TURF_CREATE(/turf/simulated/floor/outdoors/snow/plating/drift)
CRYOGAIA_TURF_CREATE(/turf/simulated/floor/outdoors/rocks)
CRYOGAIA_TURF_CREATE(/turf/simulated/floor/plating/snow/plating)
CRYOGAIA_TURF_CREATE(/turf/simulated/floor/tiled/cryogaia)
CRYOGAIA_TURF_CREATE(/turf/simulated/floor/tiled/old_tile/gray)
/turf/simulated/floor/outdoors/grass/cryogaia