mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
Conflicts II
This commit is contained in:
@@ -251,4 +251,4 @@ atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/
|
||||
|
||||
/obj/item/weapon/circuitboard/aicore
|
||||
name = "circuit board (AI core)"
|
||||
origin_tech = "programming=4;biotech=2"
|
||||
origin_tech = "programming=3"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
/obj/structure/closet/secure_closet/hydroponics/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/bag/plants/portaseeder(src)
|
||||
new /obj/item/device/analyzer/plant_analyzer(src)
|
||||
new /obj/item/device/plant_analyzer(src)
|
||||
new /obj/item/device/radio/headset/headset_srv(src)
|
||||
new /obj/item/weapon/cultivator(src)
|
||||
new /obj/item/weapon/hatchet(src)
|
||||
|
||||
@@ -17,12 +17,24 @@
|
||||
/turf/closed/wall,
|
||||
/turf/closed/wall/r_wall,
|
||||
/obj/structure/falsewall,
|
||||
/obj/structure/falsewall/reinforced, // WHY DO WE SMOOTH WITH FALSE R-WALLS WHEN WE DON'T SMOOTH WITH REAL R-WALLS.
|
||||
/obj/structure/falsewall/reinforced,
|
||||
/turf/closed/wall/rust,
|
||||
/turf/closed/wall/r_wall/rust)
|
||||
smooth = SMOOTH_TRUE
|
||||
can_be_unanchored = 0
|
||||
|
||||
/obj/structure/falsewall/New(loc)
|
||||
..()
|
||||
air_update_turf(1)
|
||||
|
||||
/obj/structure/falsewall/Destroy()
|
||||
density = 0
|
||||
air_update_turf(1)
|
||||
return ..()
|
||||
|
||||
/obj/structure/falsewall/CanAtmosPass(turf/T)
|
||||
return !density
|
||||
|
||||
/obj/structure/falsewall/attack_hand(mob/user)
|
||||
if(opening)
|
||||
return
|
||||
@@ -46,6 +58,7 @@
|
||||
if(!qdeleted(src))
|
||||
SetOpacity(1)
|
||||
update_icon()
|
||||
air_update_turf(1)
|
||||
opening = 0
|
||||
|
||||
/obj/structure/falsewall/attack_animal(mob/living/simple_animal/user)
|
||||
@@ -68,7 +81,7 @@
|
||||
if(density)
|
||||
smooth = SMOOTH_TRUE
|
||||
queue_smooth(src)
|
||||
icon_state = ""
|
||||
icon_state = "wall"
|
||||
else
|
||||
icon_state = "fwall_open"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user