Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

This commit is contained in:
izac112
2025-01-14 02:20:30 +01:00
815 changed files with 7129 additions and 8204 deletions
@@ -53,7 +53,7 @@
starts_with = null
if(!opened) // if closed, any item at the crate's loc is put in the contents
if(istype(loc, /mob/living)) return
if(isliving(loc)) return
var/obj/item/I
for(I in loc)
if(I.density || I.anchored || I == src) continue
@@ -552,7 +552,7 @@
set category = "Object"
set name = "Vore Occupants"
if(!istype(usr, /mob/living)) //no ghosts
if(!isliving(usr)) //no ghosts
return
if(!(usr in src.contents))
@@ -562,7 +562,7 @@
var/list/targets = list() //IF IT IS NOT BROKEN. DO NOT FIX IT.
for(var/mob/living/L in src.contents)
if(!istype(L, /mob/living)) //Don't eat anything that isn't mob/living. Failsafe.
if(!isliving(L)) //Don't eat anything that isn't mob/living. Failsafe.
continue
if(L == usr) //no eating yourself. 1984.
continue
@@ -578,7 +578,7 @@
if(!target)
return
if(!istype(target, /mob/living)) //Safety.
if(!isliving(target)) //Safety.
to_chat(src, span_warning("You need to select a living target!"))
return
@@ -42,7 +42,7 @@
add_fingerprint(M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.m_intent == "walk")
if(H.m_intent == I_WALK)
to_chat(H, span_warning("You stop at the edge of \the [src.name]."))
return FALSE
else
@@ -31,7 +31,7 @@
return
/obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob)
if (istype(user, /mob/living/silicon/ai)) //Added by Strumpetplaya - AI shouldn't be able to
if (isAI(user)) //Added by Strumpetplaya - AI shouldn't be able to
return //activate emergency lockers. This fixes that. (Does this make sense, the AI can't call attack_hand, can it? --Mloc)
if(!amount)
to_chat(user, "<spawn class='notice'>It's empty..")
+1 -1
View File
@@ -279,7 +279,7 @@
if(gargoyle.adminbus_trash || is_type_in_list(I,edible_trash) && I.trash_eatable && !is_type_in_list(I,item_vore_blacklist))
gargoyle.hitby(AM, speed)
return
else if(istype(AM,/mob/living) && gargoyle)
else if(isliving(AM) && gargoyle)
var/mob/living/L = AM
if(gargoyle.throw_vore && L.throw_vore && gargoyle.can_be_drop_pred && L.can_be_drop_prey)
var/drop_prey_temp = FALSE
@@ -173,7 +173,7 @@
icon_state_opened = "redgate_hole"
/obj/structure/ghost_pod/ghost_activated/maintpred/redgate/Initialize()
..()
. = ..()
if(!(src in active_ghost_pods))
active_ghost_pods += src
@@ -252,6 +252,6 @@
qdel(src)
/obj/structure/ghost_pod/ghost_activated/maint_lurker/Initialize()
..()
. = ..()
if(!(src in active_ghost_pods))
active_ghost_pods += src
+1 -1
View File
@@ -32,7 +32,7 @@
var/damage_dealt = 1
var/attack_message = "kicks"
if(istype(user,/mob/living/carbon/human))
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
attack_message = "mangles"
@@ -32,7 +32,7 @@
if(!istype(victim))
return
if(istype(victim, /mob/living/carbon/human))
if(ishuman(victim))
var/mob/living/carbon/human/H = victim
if(istype(H.species, /datum/species/monkey))
meat_type = H.species.meat_type
@@ -226,7 +226,7 @@
set name = "Toggle IV Mode"
set src in view(1)
if(!istype(usr, /mob/living))
if(!isliving(usr))
to_chat(usr, span_warning("You can't do that."))
return
+1 -1
View File
@@ -12,13 +12,13 @@
var/datum/tgui_module/appearance_changer/mirror/M
/obj/structure/mirror/Initialize(mapload, var/dir, var/building = 0)
. = ..()
M = new(src, null)
if(building)
glass = 0
icon_state = "mirror_frame"
pixel_x = (dir & 3)? 0 : (dir == 4 ? -28 : 28)
pixel_y = (dir & 3)? (dir == 1 ? -30 : 30) : 0
return
/obj/structure/mirror/Destroy()
QDEL_NULL(M)
+1 -1
View File
@@ -22,7 +22,7 @@
if(!(I in allowed_items))
to_chat(user, span_notice("\The [src] cannot cremate while there are items inside!"))
return
if(istype(I, /mob/living))
if(isliving(I))
var/mob/living/cremated = I
for(var/Z in cremated.contents)
if(!(Z in allowed_items))
+2 -2
View File
@@ -51,8 +51,8 @@
plane = MOB_PLANE
var/sourcepillow = "/obj/item/bedsheet/pillow"
/obj/structure/bed/pillowpile/New()
..()
/obj/structure/bed/pillowpile/Initialize()
. = ..()
var/turf/T = get_turf(src)
new pillowpilefront(T)
@@ -27,6 +27,7 @@
interaction_message = span_notice("The prismatic turret seems to be able to rotate.")
/obj/structure/prop/prism/Initialize()
. = ..()
if(degrees_from_north)
animate(src, transform = turn(NORTH, degrees_from_north), time = 3)
@@ -252,6 +252,7 @@
icon_state = "stamper_on"
/obj/structure/prop/machine/stamper/starts_on/Initialize()
. = ..()
add_overlay("stamper_proc")
add_overlay("stamper_but")
@@ -580,6 +581,7 @@
var/contents_original_pixel_y = 0
/obj/structure/prop/machine/nt_pod/Initialize(mapload)
. = ..()
// Our non-map-preview state
icon_state = "nt_pod"
+1 -1
View File
@@ -12,7 +12,7 @@
var/list/active_beams
/obj/structure/cult/pylon/swarm/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living))
if(isliving(mover))
var/mob/living/L = mover
if(L.faction == FACTION_SWARMER)
return TRUE
+1 -1
View File
@@ -233,7 +233,7 @@
// Handle harm intent grabbing/tabling.
if(istype(W, /obj/item/grab) && get_dist(src,user)<2)
var/obj/item/grab/G = W
if (istype(G.affecting, /mob/living))
if (isliving(G.affecting))
var/mob/living/M = G.affecting
var/obj/occupied = turf_is_crowded()
if(occupied)
+1
View File
@@ -23,6 +23,7 @@ FLOOR SAFES
/obj/structure/safe/Initialize()
. = ..()
tumbler_1_pos = rand(0, 72)
tumbler_1_open = rand(0, 72)
+12 -12
View File
@@ -242,41 +242,41 @@
SSradiation.radiate(src, round(material.radioactivity/3))
/obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_IRON)
. = ..(mapload, material_name || MAT_IRON)
/obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_SILVER)
. = ..(mapload, material_name || MAT_SILVER)
/obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_GOLD)
. = ..(mapload, material_name || MAT_GOLD)
/obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_URANIUM)
. = ..(mapload, material_name || MAT_URANIUM)
/obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_SANDSTONE)
. = ..(mapload, material_name || MAT_SANDSTONE)
/obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_PHORON)
. = ..(mapload, material_name || MAT_PHORON)
/obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_DIAMOND)
. = ..(mapload, material_name || MAT_DIAMOND)
/obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_WOOD)
. = ..(mapload, material_name || MAT_WOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/hardwood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_HARDWOOD)
. = ..(mapload, material_name || MAT_HARDWOOD)
/obj/structure/simple_door/sifwood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_SIFWOOD)
. = ..(mapload, material_name || MAT_SIFWOOD)
/obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_RESIN)
. = ..(mapload, material_name || MAT_RESIN)
/obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_CULT)
. = ..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/cult/TryToSwitchState(atom/user)
if(isliving(user))
@@ -43,7 +43,7 @@
#undef NEST_RESIST_TIME
/obj/structure/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || ispAI(user) )
return
unbuckle_mob()
@@ -23,18 +23,18 @@
var/applies_material_colour = 1
var/flippable = TRUE
/obj/structure/bed/New(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc)
color = null
if(!new_material)
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(!istype(material))
qdel(src)
return
return INITIALIZE_HINT_QDEL
if(new_padding_material)
padding_material = get_material_by_name(new_padding_material)
update_icon()
return INITIALIZE_HINT_NORMAL
/obj/structure/bed/get_material()
return material
@@ -199,19 +199,19 @@
icon_state = "psychbed"
base_icon = "psychbed"
/obj/structure/bed/psych/New(var/newloc)
..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/psych/Initialize(var/newloc)
. = ..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/padded/New(var/newloc)
..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/padded/Initialize(var/newloc)
. = ..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/double
name = "double bed"
icon_state = "doublebed"
base_icon = "doublebed"
/obj/structure/bed/double/padded/New(var/newloc)
..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/padded/Initialize(var/newloc)
. = ..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
if(M.buckled == src)
@@ -305,8 +305,8 @@
icon_state = "rollerbed"
var/obj/item/roller/held
/obj/item/roller_holder/New()
..()
/obj/item/roller_holder/Initialize()
. = ..()
held = new /obj/item/roller(src)
/obj/item/roller_holder/attack_self(mob/user as mob)
@@ -9,8 +9,8 @@
buckle_lying = 0 //force people to sit up in chairs when buckled
var/propelled = 0 // Check for fire-extinguisher-driven chairs
/obj/structure/bed/chair/New(var/newloc, var/new_material, var/new_padding_material)
..()
/obj/structure/bed/chair/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..()
update_layer()
/obj/structure/bed/chair/attackby(obj/item/W as obj, mob/user as mob)
@@ -127,38 +127,38 @@
I.color = padding_material.icon_colour
add_overlay(I)
/obj/structure/bed/chair/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/purp/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/purp/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/orange/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/orange/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
name = "rounded chair"
@@ -166,38 +166,38 @@
icon_state = "roundedchair"
base_icon = "roundedchair"
/obj/structure/bed/chair/comfy/rounded/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/orange/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
anchored = FALSE
@@ -246,7 +246,7 @@
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, blocked, soaked)
playsound(src, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
if(isliving(A))
var/mob/living/victim = A
def_zone = ran_zone()
blocked = victim.run_armor_check(def_zone, "melee")
@@ -277,8 +277,8 @@
return
..()
/obj/structure/bed/chair/wood/New(var/newloc)
..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/Initialize(var/newloc)
. = ..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/wings
icon_state = "wooden_chair_wings"
@@ -364,8 +364,8 @@
color = null
var/padding_color = "#CC0000"
/obj/structure/bed/chair/sofa/bench/New(var/newloc, var/new_material, var/new_padding_material)
..()
/obj/structure/bed/chair/sofa/bench/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..()
var/mutable_appearance/MA
// If we're north-facing, metal goes above mob, padding overlay goes below mob.
if((dir & NORTH) && !corner_piece)
@@ -6,8 +6,8 @@
base_icon = "modern_chair"
applies_material_colour = 0
/obj/structure/bed/chair/modern_chair/New(var/newloc, var/new_material, var/new_padding_material)
..()
/obj/structure/bed/chair/modern_chair/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..()
var/image/I = image(icon, "[base_icon]_over")
I.layer = ABOVE_MOB_LAYER
I.plane = MOB_PLANE
@@ -122,35 +122,35 @@
base_icon = "bay_chair"
buckle_movable = 1
/obj/structure/bed/chair/bay/chair/padded/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/chair/padded/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy
name = "comfy mounted chair"
@@ -158,35 +158,35 @@
icon_state = "bay_comfychair_preview"
base_icon = "bay_comfychair"
/obj/structure/bed/chair/bay/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/comfy/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain
name = "captain chair"
@@ -201,8 +201,8 @@
I.layer = ABOVE_MOB_LAYER
add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/captain/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle
name = "shuttle seat"
@@ -213,8 +213,8 @@
var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = MAT_CLOTH_BLUE
/obj/structure/bed/chair/bay/shuttle/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/post_buckle_mob()
playsound(src,buckling_sound,75,1)
@@ -72,7 +72,7 @@ var/global/list/stool_cache = list() //haha stool
update_icon()
/obj/item/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
if (prob(5) && isliving(M))
user.visible_message(span_danger("[user] breaks [src] over [M]'s back!"))
user.setClickCooldown(user.get_attack_speed())
user.do_attack_animation(M)
@@ -13,7 +13,7 @@
var/min_mob_buckle_size = MOB_SMALL
var/max_mob_buckle_size = MOB_LARGE
/obj/structure/bed/chair/wheelchair/New(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/wheelchair/Initialize(var/newloc, var/new_material, var/new_padding_material)
..()
update_icon()
@@ -195,7 +195,7 @@
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, soaked)
playsound(src, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
if(isliving(A))
var/mob/living/victim = A
def_zone = ran_zone()
blocked = victim.run_armor_check(def_zone, "melee")
+2 -2
View File
@@ -187,7 +187,7 @@
else if (user.a_intent == I_HURT)
if (istype(user,/mob/living/carbon/human))
if (ishuman(user))
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
attack_generic(H,25)
@@ -241,7 +241,7 @@
// Slamming.
if (istype(W, /obj/item/grab) && get_dist(src,user)<2)
var/obj/item/grab/G = W
if(istype(G.affecting,/mob/living))
if(isliving(G.affecting))
var/mob/living/M = G.affecting
var/state = G.state
qdel(W) //gotta delete it here because if window breaks, it won't get deleted