mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 04:17:33 +01:00
Remaps Intrepid and ports CM's double seats (#20809)
## About PR - Introduces a dropship-esque Intrepid, making it feel more like a public transport in a overpopulous city, while trying to avoid chokepoints. - Ports the CM's double seats. - Removes access restriction from Intrepid's side airlocks, to be in par with the main airlock. - Deletes some rogue pipes near hangar bay. - Re-adds a small oven which was introduced in #16449. With slight tweaks and different colour palette. This is probably an awful way to port CM's vehicle seats, but in testing only issue I've found is: when the chair occupant punches someone, their own buckle off-set will get reset. I am not sure why. The way the double seats work is, it'll let anyone pass through as long as both of the seats aren't occupied at the same time. ## Images <details><summary>Details</summary> <p>  </p> </details> --------- Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com> Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
This commit is contained in:
@@ -20,6 +20,12 @@
|
||||
var/open = FALSE // Start closed so people don't heat up ovens with the door open
|
||||
///Looping sound for the oven
|
||||
var/datum/looping_sound/oven/oven_loop
|
||||
///Open door icon_state
|
||||
var/door_open = "ovenopen"
|
||||
///Closed door icon_state
|
||||
var/door_closed = "ovenclosed"
|
||||
var/door_open_overlay = "ovenopen_on"
|
||||
var/door_closed_overlay = "ovenclosed_on"
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/cooking_container/oven,
|
||||
@@ -54,15 +60,15 @@
|
||||
ClearOverlays()
|
||||
update_baking_audio()
|
||||
if(!open)
|
||||
icon_state = "ovenclosed"
|
||||
icon_state = door_closed
|
||||
if(!stat)
|
||||
var/image/ovenclosed_on = image('icons/obj/machinery/cooking_machines.dmi', "ovenclosed_on")
|
||||
var/image/ovenclosed_on = image('icons/obj/machinery/cooking_machines.dmi', door_closed_overlay)
|
||||
ovenclosed_on.plane = EFFECTS_ABOVE_LIGHTING_PLANE
|
||||
AddOverlays(ovenclosed_on)
|
||||
else
|
||||
icon_state = "ovenopen"
|
||||
icon_state = door_open
|
||||
if(!stat)
|
||||
var/image/ovenopen_on = image('icons/obj/machinery/cooking_machines.dmi', "ovenopen_on")
|
||||
var/image/ovenopen_on = image('icons/obj/machinery/cooking_machines.dmi', door_open_overlay)
|
||||
ovenopen_on.plane = EFFECTS_ABOVE_LIGHTING_PLANE
|
||||
AddOverlays(ovenopen_on)
|
||||
..()
|
||||
@@ -141,3 +147,15 @@
|
||||
icon_state = "adhomai_ovenclosed_off"
|
||||
else
|
||||
icon_state = "adhomai_oven_open"
|
||||
|
||||
/obj/machinery/appliance/cooker/oven/small
|
||||
name = "compact oven"
|
||||
desc = "A lightweight, small oven. Doesn't hold much, but it cooks just fine."
|
||||
density = FALSE
|
||||
|
||||
max_contents = 2
|
||||
icon_state = "small_ovenopen"
|
||||
door_open = "small_ovenopen"
|
||||
door_closed = "small_ovenclosed"
|
||||
door_open_overlay = "small_ovenopen_on"
|
||||
door_closed_overlay = "small_ovenclosed_on"
|
||||
|
||||
Reference in New Issue
Block a user