mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-08-30 08:06:17 +01:00
Revert "Finally, MultiZ Layenia"
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
/obj/effect/landmark/start/lambent
|
||||
name = "Lambent"
|
||||
icon_state = "Lambent"
|
||||
|
||||
/obj/effect/landmark/start/barber
|
||||
name = "Barber"
|
||||
icon_state = "Barber"
|
||||
|
||||
/obj/effect/landmark/start/barista
|
||||
name = "Barista"
|
||||
icon_state = "Barista"
|
||||
@@ -1,2 +0,0 @@
|
||||
/obj/item/card/id
|
||||
var/last_job_switch /// Last job switch for card's owner
|
||||
@@ -1,3 +0,0 @@
|
||||
/obj/item/circuitboard/computer/timeclock
|
||||
name = "Timeclock (Computer Board)"
|
||||
build_path = /obj/machinery/computer/timeclock
|
||||
@@ -0,0 +1,2 @@
|
||||
/obj/item/radio
|
||||
var/list/extra_channels = list() //Allows indivudal channels, used for borgs
|
||||
@@ -1,4 +1,3 @@
|
||||
//Farm things
|
||||
/turf/open/floor/
|
||||
var/farm_quality = 0 //all tiles have a farm quality, which is for farm animals to enjoy. 0 = worse 100 = best!
|
||||
|
||||
@@ -27,11 +26,3 @@
|
||||
icon_state = "hay"
|
||||
farm_quality = 100 //the best for farming!
|
||||
floor_tile = /obj/item/stack/tile/hay
|
||||
|
||||
//Carpets
|
||||
/obj/item/stack/tile/carpet/kinaris
|
||||
name = "gilded carpet"
|
||||
icon = 'hyperstation/icons/obj/tiles.dmi'
|
||||
icon_state = "tile-carpet-kinaris"
|
||||
turf_type = /turf/open/floor/carpet/kinaris
|
||||
tableVariant = /obj/structure/table/wood/fancy/kinaris
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
var/heat_resistance = 800
|
||||
var/health = 70
|
||||
var/maxhealth = 70
|
||||
layer = BELOW_MOB_LAYER
|
||||
|
||||
|
||||
resistance_flags = ACID_PROOF
|
||||
@@ -164,6 +165,14 @@
|
||||
usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")
|
||||
usr.do_twist(targetangle = 45, timer = 8)
|
||||
|
||||
/obj/structure/railing/Initialize(mapload) //mobs will show under the south railing sprite, thanks Cyanosis for helping with the fix
|
||||
. = ..()
|
||||
if(!mapload)
|
||||
return
|
||||
if(!(dir & SOUTH))
|
||||
return
|
||||
layer = ABOVE_MOB_LAYER
|
||||
|
||||
/obj/structure/railing/handrail
|
||||
name = "handrail"
|
||||
desc = "A waist high handrail, perhaps you could climb over it."
|
||||
|
||||
@@ -9,15 +9,3 @@
|
||||
icon_state = "bench_left"
|
||||
/obj/structure/chair/bench/right
|
||||
icon_state = "bench_right"
|
||||
|
||||
/obj/structure/chair/bench/metal
|
||||
name = "bench"
|
||||
icon_state = "bench_metal_middle"
|
||||
icon = 'hyperstation/icons/obj/bench.dmi'
|
||||
buildstackamount = 1
|
||||
buildstacktype = /obj/item/stack/sheet/metal
|
||||
|
||||
/obj/structure/chair/bench/metal/left
|
||||
icon_state = "bench_metal_left"
|
||||
/obj/structure/chair/bench/metal/right
|
||||
icon_state = "bench_metal_right"
|
||||
@@ -165,35 +165,3 @@
|
||||
|
||||
/obj/effect/mob_spawn/human/villager/special(mob/living/carbon/human/new_spawn)
|
||||
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
|
||||
|
||||
|
||||
//Prisoner
|
||||
/obj/effect/mob_spawn/human/prisoner
|
||||
name = "prisoner transfer cryoteleporter"
|
||||
mob_name = "prisoner transfer"
|
||||
icon = 'icons/obj/machines/sleeper.dmi'
|
||||
icon_state = "sleeper"
|
||||
job_description = "Prisoner Transfer"
|
||||
outfit = /datum/outfit/prisoner
|
||||
id_job = "Prisoner Transfer"
|
||||
assignedrole = "Prisoner Transfer"
|
||||
short_desc = "You are a transferred prisoner to Layenia. Don't break out or otherwise act like an antag."
|
||||
flavour_text = "For one reason or another, you are a prisoner. Kinaris has chosen to temporarily hold you within Layenia Station's holding area, \
|
||||
until the end of the shift. You do not permanently reside here, but you may end up in this place from shift to shift. It is highly recommended to \
|
||||
make a unique character slot for this role. Kinaris would not neuter or otherwise remove identifying features that make you who you are; such as \
|
||||
altering your name, features, or physical appearance. As a prisoner, you still uphold a decent amount of rights."
|
||||
important_info = "Do NOT attempt to break out, antagonize, or otherwise treat your role as anything to grief with. Should you find a scenario where you want to, AHELP."
|
||||
objectives = "Do NOT attempt to break out or act like an antag. Serve your time until end of shift."
|
||||
mirrorcanloadappearance = TRUE
|
||||
roundstart = FALSE
|
||||
death = FALSE
|
||||
|
||||
/datum/outfit/prisoner
|
||||
name = "Prisoner"
|
||||
uniform = /obj/item/clothing/under/rank/prisoner
|
||||
shoes = /obj/item/clothing/shoes/sneakers/orange
|
||||
id = /obj/item/card/id/prisoner
|
||||
implants = list(/obj/item/implant/exile, /obj/item/implant/tracking)
|
||||
|
||||
/obj/effect/mob_spawn/human/prisoner/special(mob/living/carbon/human/new_spawn)
|
||||
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
/obj/structure/table/wood/fancy/kinaris
|
||||
icon = 'hyperstation/icons/obj/structures.dmi'
|
||||
icon_state = "fancy_table_kinaris"
|
||||
buildstack = /obj/item/stack/tile/carpet/kinaris
|
||||
canSmoothWith = list(/obj/structure/table/wood/fancy/kinaris)
|
||||
|
||||
/obj/structure/table/wood/fancy/kinaris/New()
|
||||
. = ..()
|
||||
icon = 'hyperstation/icons/obj/smooth_structures/fancy_table_kinaris.dmi'
|
||||
Reference in New Issue
Block a user