cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes var/ inside all procs (#19450)

Browse Source 
* removes var/ inside all procs

* .

* ugh
This commit is contained in:
Kashargul
2026-05-05 10:55:17 +02:00
committed by GitHub
parent 13162d13a2
commit 5926589c16
1987 changed files with 7376 additions and 7377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/alien/alien.dm
+2 -2
View File
@@ -13,7 +13,7 @@
qdel(src)
return
/obj/structure/alien/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/alien/bullet_act(obj/item/projectile/Proj)
health -= Proj.damage
..()
healthcheck()
@@ -52,7 +52,7 @@
..()
return
/obj/structure/alien/attack_generic(var/mob/user, var/damage, var/attack_verb)
/obj/structure/alien/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
user.do_attack_animation(src)
code/game/objects/structures/artstuff.dm
+2 -2
View File
@@ -293,7 +293,7 @@
hud_level = FALSE
update_paint()
/obj/item/paint_brush/proc/update_paint(var/new_color)
/obj/item/paint_brush/proc/update_paint(new_color)
if(new_color)
selected_color = new_color
color_drop.color = new_color
@@ -553,7 +553,7 @@
* TODO: create a machine in the library for curators to spawn canvases and refactor this to use the proc used there.
* For now, we do it this way because calling this on a canvas itself might cause issues due to the whole dimension thing.
*/
/obj/structure/sign/painting/proc/admin_lateload_painting(var/spawn_specific = 0, var/which_painting = 0)
/obj/structure/sign/painting/proc/admin_lateload_painting(spawn_specific = 0, which_painting = 0)
if(!check_rights_for(usr.client, R_HOLDER))
return 0
if(spawn_specific && isnum(which_painting))
code/game/objects/structures/barricades.dm
+6 -6
View File
@@ -10,7 +10,7 @@
var/maxhealth = 100
var/datum/material/material
/obj/structure/barricade/Initialize(mapload, var/material_name)
/obj/structure/barricade/Initialize(mapload, material_name)
. = ..()
if(!material_name)
material_name = MAT_WOOD
@@ -77,12 +77,12 @@
return
/obj/structure/barricade/take_damage(var/damage)
/obj/structure/barricade/take_damage(damage)
health -= damage
CheckHealth()
return
/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb)
/obj/structure/barricade/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
@@ -128,7 +128,7 @@
icon = 'icons/obj/sandbags.dmi'
icon_state = "blank"
/obj/structure/barricade/sandbag/Initialize(mapload, var/material_name)
/obj/structure/barricade/sandbag/Initialize(mapload, material_name)
if(!material_name)
material_name = MAT_CLOTH
. = ..(mapload, material_name)
@@ -164,7 +164,7 @@
return
/obj/structure/barricade/sandbag/update_connections(propagate = 0, var/obj/structure/barricade/sandbag/ignore = null)
/obj/structure/barricade/sandbag/update_connections(propagate = 0, obj/structure/barricade/sandbag/ignore = null)
if(!material)
return
var/list/dirs = list()
@@ -182,7 +182,7 @@
update_icon()
/obj/structure/barricade/sandbag/proc/can_join_with(var/obj/structure/barricade/sandbag/S)
/obj/structure/barricade/sandbag/proc/can_join_with(obj/structure/barricade/sandbag/S)
if(material == S.material)
return 1
return 0
code/game/objects/structures/bonfire.dm
+2 -2
View File
@@ -128,7 +128,7 @@
/obj/structure/bonfire/permanent/add_fuel(mob/user)
to_chat(user, span_warning("\The [src] has plenty of fuel and doesn't need more fuel."))
/obj/structure/bonfire/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
/obj/structure/bonfire/proc/consume_fuel(obj/item/stack/consumed_fuel)
if(!istype(consumed_fuel))
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
@@ -328,7 +328,7 @@
to_chat(user, span_warning("\The [src] needs raw wood to burn, \a [new_fuel] won't work."))
return FALSE
/obj/structure/fireplace/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
/obj/structure/fireplace/proc/consume_fuel(obj/item/stack/consumed_fuel)
if(!istype(consumed_fuel))
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
code/game/objects/structures/catwalk.dm
+1 -1
View File
@@ -76,7 +76,7 @@
new /obj/item/stack/rods(src.loc, 2) //VOREstation Edit: Conservation of mass
qdel(src)
/obj/structure/catwalk/attack_robot(var/mob/user)
/obj/structure/catwalk/attack_robot(mob/user)
if(Adjacent(user))
attack_hand(user)
code/game/objects/structures/crates_lockers/__closets.dm
+11 -11
View File
@@ -173,7 +173,7 @@
return 1
//Cham Projector Exception
/obj/structure/closet/proc/store_misc(var/stored_units)
/obj/structure/closet/proc/store_misc(stored_units)
var/added_units = 0
for(var/obj/effect/dummy/chameleon/AD in loc)
if((stored_units + added_units) > storage_capacity)
@@ -182,7 +182,7 @@
added_units++
return added_units
/obj/structure/closet/proc/store_items(var/stored_units)
/obj/structure/closet/proc/store_items(stored_units)
var/added_units = 0
for(var/obj/item/I in loc)
var/item_size = CEILING(I.w_class / 2, 1)
@@ -193,7 +193,7 @@
added_units += item_size
return added_units
/obj/structure/closet/proc/store_mobs(var/stored_units)
/obj/structure/closet/proc/store_mobs(stored_units)
var/added_units = 0
for(var/mob/living/M in loc)
if(M.buckled || M.pinned.len)
@@ -204,7 +204,7 @@
added_units += M.mob_size
return added_units
/obj/structure/closet/proc/store_closets(var/stored_units)
/obj/structure/closet/proc/store_closets(stored_units)
var/added_units = 0
for(var/obj/structure/closet/C in loc)
if(C == src) //Don't store ourself
@@ -250,14 +250,14 @@
/obj/structure/closet/blob_act()
damage(100)
/obj/structure/closet/proc/damage(var/damage)
/obj/structure/closet/proc/damage(damage)
health -= damage
if(health <= 0)
for(var/atom/movable/A in src)
A.forceMove(loc)
qdel(src)
/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/closet/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage)
return
@@ -414,7 +414,7 @@
else
icon_state = "closed_unlocked[sealed ? "_welded" : ""]"
/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys")
/obj/structure/closet/attack_generic(mob/user, damage, attack_message = "destroys")
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return
user.do_attack_animation(src)
@@ -430,7 +430,7 @@
return 0 //closed but not sealed...
return 1
/obj/structure/closet/container_resist(var/mob/living/escapee)
/obj/structure/closet/container_resist(mob/living/escapee)
if(breakout || !req_breakout())
return
@@ -475,19 +475,19 @@
BD.unwrap()
open()
/obj/structure/closet/onDropInto(var/atom/movable/AM)
/obj/structure/closet/onDropInto(atom/movable/AM)
return
/obj/structure/closet/AllowDrop()
return TRUE
/obj/structure/closet/return_air_for_internal_lifeform(var/mob/living/L)
/obj/structure/closet/return_air_for_internal_lifeform(mob/living/L)
if(loc)
if(istype(loc, /obj/structure/closet))
return (loc.return_air_for_internal_lifeform(L))
return return_air()
/obj/structure/closet/take_damage(var/damage)
/obj/structure/closet/take_damage(damage)
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return
dump_contents()
code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/structure/closet/debug/Initialize(mapload, var/newappearance)
/obj/structure/closet/debug/Initialize(mapload, newappearance)
closet_appearance = newappearance
. = ..()
code/game/objects/structures/crates_lockers/closets/coffin.dm
+2 -2
View File
@@ -145,10 +145,10 @@
.=..()
alpha = 255 // Needed because of grave hiding
/obj/structure/closet/grave/bullet_act(var/obj/item/projectile/P)
/obj/structure/closet/grave/bullet_act(obj/item/projectile/P)
return PROJECTILE_CONTINUE // It's a hole in the ground, doesn't usually stop or even care about bullets
/obj/structure/closet/grave/return_air_for_internal_lifeform(var/mob/living/L)
/obj/structure/closet/grave/return_air_for_internal_lifeform(mob/living/L)
var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1 -1
View File
@@ -83,7 +83,7 @@
to_chat(user, span_warning("Access Denied"))
update_icon()
/obj/structure/closet/secure_closet/personal/emag_act(var/remaining_charges, var/mob/user, var/visual_feedback, var/audible_feedback)
/obj/structure/closet/secure_closet/personal/emag_act(remaining_charges, mob/user, visual_feedback, audible_feedback)
if(!broken)
broken = 1
locked = 0
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+2 -2
View File
@@ -95,7 +95,7 @@
else
togglelock(user)
/obj/structure/closet/secure_closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
/obj/structure/closet/secure_closet/emag_act(remaining_charges, mob/user, emag_source, visual_feedback = "", audible_feedback = "")
if(!broken)
broken = 1
locked = 0
@@ -163,7 +163,7 @@
var/self_del = 1
anchored = 0
/obj/structure/closet/secure_closet/mind/Initialize(mapload, var/datum/mind/mind_target, var/del_self = 1)
/obj/structure/closet/secure_closet/mind/Initialize(mapload, datum/mind/mind_target, del_self = 1)
. = ..()
self_del = del_self
if(mind_target)
code/game/objects/structures/crates_lockers/closets/statue.dm
+3 -3
View File
@@ -14,7 +14,7 @@
var/intialOxy = 0
var/timer = 240 //eventually the person will be freed
/obj/structure/closet/statue/Initialize(mapload, var/mob/living/L)
/obj/structure/closet/statue/Initialize(mapload, mob/living/L)
. = ..()
if(L && (ishuman(L) || L.isMonkey() || iscorgi(L)))
if(L.buckled)
@@ -81,13 +81,13 @@
for(var/mob/M in src)
shatter(M)
/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/closet/statue/bullet_act(obj/item/projectile/Proj)
health -= Proj.get_structure_damage()
check_health()
return
/obj/structure/closet/statue/attack_generic(var/mob/user, damage, attacktext, environment_smash)
/obj/structure/closet/statue/attack_generic(mob/user, damage, attacktext, environment_smash)
if(damage && environment_smash)
for(var/mob/M in src)
shatter(M)
code/game/objects/structures/crates_lockers/crates.dm
+4 -4
View File
@@ -174,7 +174,7 @@
else
to_chat(user, span_notice("Access Denied"))
/obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null)
/obj/structure/closet/crate/secure/proc/set_locked(newlocked, mob/user = null)
if(locked == newlocked) return
locked = newlocked
@@ -214,7 +214,7 @@
return
return ..()
/obj/structure/closet/crate/secure/emag_act(var/remaining_charges, var/mob/user)
/obj/structure/closet/crate/secure/emag_act(remaining_charges, mob/user)
if(!broken)
playsound(src, "sparks", 60, 1)
locked = 0
@@ -324,7 +324,7 @@
newgas.temperature = target_temp
return newgas
/obj/structure/closet/crate/freezer/Entered(var/atom/movable/AM)
/obj/structure/closet/crate/freezer/Entered(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 1
@@ -332,7 +332,7 @@
organ.preserved = 1
..()
/obj/structure/closet/crate/freezer/Exited(var/atom/movable/AM)
/obj/structure/closet/crate/freezer/Exited(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 0
code/game/objects/structures/crates_lockers/crates_vr.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/structure/closet/crate/secure
var/tamper_proof = 0
/obj/structure/closet/crate/secure/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/closet/crate/secure/bullet_act(obj/item/projectile/Proj)
if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN))
return
code/game/objects/structures/crates_lockers/vehiclecage.dm
+2 -2
View File
@@ -57,7 +57,7 @@
showcase.layer = src.layer - 0.1
underlays += showcase
/obj/structure/vehiclecage/MouseDrop_T(var/atom/movable/C, mob/user as mob)
/obj/structure/vehiclecage/MouseDrop_T(atom/movable/C, mob/user as mob)
if(user && (user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C)))
return
@@ -70,7 +70,7 @@
if(!my_vehicle)
load_vehicle(V, user)
/obj/structure/vehiclecage/proc/load_vehicle(var/obj/vehicle/V, mob/user as mob)
/obj/structure/vehiclecage/proc/load_vehicle(obj/vehicle/V, mob/user as mob)
if(user)
user.visible_message(span_notice("[user] loads \the [V] into \the [src]."), \
span_notice("You load \the [V] into \the [src]."), \
code/game/objects/structures/dancepole_vr.dm
+1 -1
View File
@@ -19,7 +19,7 @@
else
layer = BELOW_MOB_LAYER
/obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/structure/dancepole/attackby(obj/item/O as obj, mob/user as mob)
if(O.has_tool_quality(TOOL_SCREWDRIVER))
anchored = !anchored
playsound(src, O.usesound, 50, 1)
code/game/objects/structures/displaycase.dm
+1 -1
View File
@@ -28,7 +28,7 @@
src.healthcheck()
/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/displaycase/bullet_act(obj/item/projectile/Proj)
health -= Proj.get_structure_damage()
..()
src.healthcheck()
code/game/objects/structures/door_assembly.dm
+1 -1
View File
@@ -324,7 +324,7 @@
// Airlock frames are indestructable, so bullets hitting them would always be stopped.
// To fix this, airlock assemblies will sometimes let bullets pass through, since generally the sprite shows them partially open.
/obj/structure/door_assembly/bullet_act(var/obj/item/projectile/P)
/obj/structure/door_assembly/bullet_act(obj/item/projectile/P)
if(prob(40)) // Chance for the frame to let the bullet keep going.
return PROJECTILE_CONTINUE
return ..()
code/game/objects/structures/extinguisher.dm
+1 -1
View File
@@ -10,7 +10,7 @@
var/obj/item/extinguisher/has_extinguisher
var/opened = 0
/obj/structure/extinguisher_cabinet/Initialize(mapload, var/dir, var/building = 0)
/obj/structure/extinguisher_cabinet/Initialize(mapload, dir, building = 0)
. = ..()
if(building)
code/game/objects/structures/fireaxe.dm
+1 -1
View File
@@ -21,7 +21,7 @@
fireaxe = new /obj/item/material/twohanded/fireaxe()
update_icon()
/obj/structure/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
/obj/structure/fireaxecabinet/attackby(obj/item/O as obj, mob/user as mob) //Marker -Agouri
//..() //That's very useful, Erro
// This could stand to be put further in, made better, etc. but fuck you. Fuck whoever
code/game/objects/structures/fitness.dm
+2 -2
View File
@@ -11,7 +11,7 @@
density = TRUE
var/list/hit_message = list("hit", "punch", "kick", "robust")
/obj/structure/fitness/punchingbag/attack_hand(var/mob/living/carbon/human/user)
/obj/structure/fitness/punchingbag/attack_hand(mob/living/carbon/human/user)
if(!istype(user))
..()
return
@@ -41,7 +41,7 @@
weight = ((weight) % qualifiers.len) + 1
to_chat(user, "You set the machine's weight level to [weight].")
/obj/structure/fitness/weightlifter/attack_hand(var/mob/living/carbon/human/user)
/obj/structure/fitness/weightlifter/attack_hand(mob/living/carbon/human/user)
if(!istype(user))
return
if(user.loc != src.loc)
code/game/objects/structures/flora/flora.dm
+5 -5
View File
@@ -52,7 +52,7 @@
/obj/structure/flora/proc/get_harvestable_desc()
return span_notice("\The [src] seems to have something hanging from it.")
/obj/structure/flora/attackby(var/obj/item/W, var/mob/living/user)
/obj/structure/flora/attackby(obj/item/W, mob/living/user)
if(can_harvest(W))
var/harvest_spawn = pickweight(harvest_loot)
@@ -72,13 +72,13 @@
..(W, user)
/obj/structure/flora/proc/can_harvest(var/obj/item/I)
/obj/structure/flora/proc/can_harvest(obj/item/I)
. = FALSE
if(harvest_tool && istype(I, harvest_tool) && harvest_loot && harvest_loot.len && harvest_count < max_harvests)
. = TRUE
return .
/obj/structure/flora/proc/spawn_harvest(var/path = null, var/mob/user = null)
/obj/structure/flora/proc/spawn_harvest(path = null, mob/user = null)
if(!ispath(path))
return 0
@@ -129,7 +129,7 @@
min_harvests = 1
max_harvests = 3
/obj/structure/flora/ausbushes/spawn_harvest(var/path = null, var/mob/user = null)
/obj/structure/flora/ausbushes/spawn_harvest(path = null, mob/user = null)
. = ..()
if(. && prob(15))
var/static/list/possibleseeds = list(
@@ -152,7 +152,7 @@
var/choice = pickweight(possibleseeds)
new choice(get_turf(user))
/obj/structure/flora/ausbushes/Initialize(mapload, var/bush_icon)
/obj/structure/flora/ausbushes/Initialize(mapload, bush_icon)
. = ..()
if(bush_icon)
icon_state = bush_icon
code/game/objects/structures/flora/grass.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/flora/snowflora.dmi'
anchored = TRUE
/obj/structure/flora/grass/Initialize(mapload, var/grass_icon)
/obj/structure/flora/grass/Initialize(mapload, grass_icon)
. = ..()
icon_state = grass_icon
code/game/objects/structures/flora/trees.dm
+5 -5
View File
@@ -30,13 +30,13 @@
/obj/structure/flora/tree/proc/choose_icon_state()
return icon_state
/obj/structure/flora/tree/can_harvest(var/obj/item/I)
/obj/structure/flora/tree/can_harvest(obj/item/I)
. = FALSE
if(!is_stump && harvest_tool && istype(I, harvest_tool) && harvest_loot && harvest_loot.len && harvest_count < max_harvests)
. = TRUE
return .
/obj/structure/flora/tree/attackby(var/obj/item/W, var/mob/living/user)
/obj/structure/flora/tree/attackby(obj/item/W, mob/living/user)
if(can_harvest(W))
..(W, user)
return
@@ -81,7 +81,7 @@
animate(transform=M, pixel_x=init_px, time=6, easing=ELASTIC_EASING)
// Used when the tree gets hurt.
/obj/structure/flora/tree/proc/adjust_health(var/amount, var/damage_wood = FALSE)
/obj/structure/flora/tree/proc/adjust_health(amount, damage_wood = FALSE)
if(is_stump || indestructable)
return
@@ -117,10 +117,10 @@
cut_overlays() // For the Sif tree and other future glowy trees.
set_light(0)
/obj/structure/flora/tree/ex_act(var/severity)
/obj/structure/flora/tree/ex_act(severity)
adjust_health(-(max_health / severity), TRUE)
/obj/structure/flora/tree/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/flora/tree/bullet_act(obj/item/projectile/Proj)
if(Proj.get_structure_damage())
adjust_health(-Proj.get_structure_damage(), TRUE)
code/game/objects/structures/gargoyle.dm
+8 -8
View File
@@ -25,7 +25,7 @@
var/can_revert = TRUE
var/was_rayed = FALSE
/obj/structure/gargoyle/Initialize(mapload, var/mob/living/carbon/human/H, var/ident_ovr, var/mat_ovr, var/adj_ovr, var/tint_ovr, var/revert = TRUE, var/discard_clothes)
/obj/structure/gargoyle/Initialize(mapload, mob/living/carbon/human/H, ident_ovr, mat_ovr, adj_ovr, tint_ovr, revert = TRUE, discard_clothes)
. = ..()
if(isspace(loc) || isopenspace(loc))
anchored = FALSE
@@ -182,7 +182,7 @@
. += stored_examine
return
/obj/structure/gargoyle/proc/unpetrify(var/deal_damage = TRUE, var/deleting = FALSE)
/obj/structure/gargoyle/proc/unpetrify(deal_damage = TRUE, deleting = FALSE)
var/mob/living/carbon/human/gargoyle = WR_gargoyle.resolve()
if(!gargoyle)
return
@@ -227,29 +227,29 @@
/obj/structure/gargoyle/return_air()
return return_air_for_internal_lifeform()
/obj/structure/gargoyle/return_air_for_internal_lifeform(var/mob/living/lifeform)
/obj/structure/gargoyle/return_air_for_internal_lifeform(mob/living/lifeform)
var/air_type = /datum/gas_mixture/belly_air
if(istype(lifeform))
air_type = lifeform.get_perfect_belly_air_type()
var/air = new air_type(1000)
return air
/obj/structure/gargoyle/proc/damage(var/damage)
/obj/structure/gargoyle/proc/damage(damage)
if(was_rayed)
return //gargoyle quick regenerates, the others don't, so let's not have them getting too damaged
obj_integrity = min(obj_integrity-damage, max_integrity)
if(obj_integrity <= 0)
qdel(src)
/obj/structure/gargoyle/take_damage(var/damage)
/obj/structure/gargoyle/take_damage(damage)
damage(damage)
/obj/structure/gargoyle/attack_generic(var/mob/user, var/damage, var/attack_message = "hits")
/obj/structure/gargoyle/attack_generic(mob/user, damage, attack_message = "hits")
user.do_attack_animation(src)
visible_message(span_danger("[user] [attack_message] the [src]!"))
damage(damage)
/obj/structure/gargoyle/attackby(var/obj/item/W as obj, var/mob/living/user as mob)
/obj/structure/gargoyle/attackby(obj/item/W as obj, mob/living/user as mob)
var/mob/living/carbon/human/gargoyle = WR_gargoyle.resolve()
if(W.is_wrench())
if(isspace(loc) || isopenspace(loc))
@@ -278,7 +278,7 @@
else
return ..()
/obj/structure/gargoyle/set_dir(var/new_dir)
/obj/structure/gargoyle/set_dir(new_dir)
. = ..()
if(. && tail_image)
cut_overlay(tail_image)
code/game/objects/structures/ghost_pods/antagonist.dm
+2 -2
View File
@@ -13,7 +13,7 @@
delay_to_try_again = 1 MINUTES //10 minutes for egg to grow, 5 minutes for larva to mature
anchored = TRUE
/obj/structure/ghost_pod/automatic/xenomorph_egg/create_occupant(var/mob/M)
/obj/structure/ghost_pod/automatic/xenomorph_egg/create_occupant(mob/M)
var/mob/living/carbon/alien/larva/R = new(get_turf(src))
if(M.mind)
M.mind.transfer_to(R)
@@ -45,7 +45,7 @@
..()
return
/obj/structure/ghost_pod/automatic/xenomorph_egg/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/ghost_pod/automatic/xenomorph_egg/bullet_act(obj/item/projectile/Proj)
switch(Proj.damtype)
if(BURN)
health -= Proj.damage * 1.5 //It burns!
code/game/objects/structures/ghost_pods/event_vr.dm
+5 -5
View File
@@ -14,7 +14,7 @@
invisibility = INVISIBILITY_OBSERVER
spawn_active = TRUE
/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(mob/M)
..()
var/choice
var/finalized = "No"
@@ -75,7 +75,7 @@
invisibility = INVISIBILITY_OBSERVER
spawn_active = TRUE
/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(mob/M)
..()
//No OOC notes
@@ -127,7 +127,7 @@
var/redgate_restricted = FALSE
//override the standard attack_ghost proc for custom messages
/obj/structure/ghost_pod/ghost_activated/maint_lurker/attack_ghost(var/mob/observer/dead/user)
/obj/structure/ghost_pod/ghost_activated/maint_lurker/attack_ghost(mob/observer/dead/user)
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot use this spawnpoint because you are banned from playing ghost roles."))
return
@@ -149,7 +149,7 @@
create_occupant(user)
/obj/structure/ghost_pod/ghost_activated/maint_lurker/create_occupant(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/maint_lurker/create_occupant(mob/M)
..()
var/picked_ckey = M.ckey
@@ -205,7 +205,7 @@
desc = "A starting location for characters who exist inside of the redgate!"
redgate_restricted = TRUE
/obj/structure/ghost_pod/ghost_activated/maint_lurker/redgate/attack_ghost(var/mob/observer/dead/user)
/obj/structure/ghost_pod/ghost_activated/maint_lurker/redgate/attack_ghost(mob/observer/dead/user)
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot use this spawnpoint because you are banned from playing ghost roles."))
return
code/game/objects/structures/ghost_pods/ghost_pods.dm
+5 -5
View File
@@ -14,7 +14,7 @@
var/delay_to_try_again = 0 // How long to wait if first attempt fails. Set to 0 to never try again.
// Call this to get a ghost volunteer.
/obj/structure/ghost_pod/proc/trigger(var/alert, var/adminalert)
/obj/structure/ghost_pod/proc/trigger(alert, adminalert)
if(!ghost_query_type)
return FALSE
if(busy)
@@ -45,7 +45,7 @@
QDEL_NULL(Q) //get rid of the query
// Override this to create whatever mob you need. Be sure to call ..() if you don't want it to make infinite mobs.
/obj/structure/ghost_pod/proc/create_occupant(var/mob/M)
/obj/structure/ghost_pod/proc/create_occupant(mob/M)
used = TRUE
icon_state = icon_state_opened
GLOB.active_ghost_pods -= src
@@ -58,7 +58,7 @@
/obj/structure/ghost_pod/manual
var/confirm_before_open = FALSE // Recommended to be TRUE if the pod contains a surprise.
/obj/structure/ghost_pod/manual/attack_hand(var/mob/living/user)
/obj/structure/ghost_pod/manual/attack_hand(mob/living/user)
if(!used)
if(confirm_before_open)
if(tgui_alert(user, "Are you sure you want to touch \the [src]?", "Confirm", list("No", "Yes")) != "Yes")
@@ -70,7 +70,7 @@
ghostpod_startup(FALSE)
// VOREStation Addition End
/obj/structure/ghost_pod/manual/attack_ai(var/mob/living/silicon/user)
/obj/structure/ghost_pod/manual/attack_ai(mob/living/silicon/user)
if(Adjacent(user))
attack_hand(user) // Borgs can open pods.
@@ -93,7 +93,7 @@
/obj/structure/ghost_pod/ghost_activated
description_info = "A ghost can click on this to return to the round as whatever is contained inside this object."
/obj/structure/ghost_pod/ghost_activated/attack_ghost(var/mob/observer/dead/user)
/obj/structure/ghost_pod/ghost_activated/attack_ghost(mob/observer/dead/user)
//VOREStation Add Start
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles."))
code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
+2 -2
View File
@@ -9,7 +9,7 @@
var/remains_active = FALSE
var/activated = FALSE
/obj/structure/ghost_pod/manual/attack_ghost(var/mob/observer/dead/user)
/obj/structure/ghost_pod/manual/attack_ghost(mob/observer/dead/user)
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles."))
return
@@ -45,7 +45,7 @@
create_occupant(user)
/obj/structure/ghost_pod/proc/ghostpod_startup(var/notify = FALSE)
/obj/structure/ghost_pod/proc/ghostpod_startup(notify = FALSE)
GLOB.active_ghost_pods |= src
if(notify)
trigger()
code/game/objects/structures/ghost_pods/human.dm
+2 -2
View File
@@ -37,7 +37,7 @@
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/radio/headset
/obj/structure/ghost_pod/ghost_activated/human/create_occupant(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/human/create_occupant(mob/M)
..()
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = new(src)
@@ -165,7 +165,7 @@
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/radio/headset
/obj/structure/ghost_pod/manual/human/create_occupant(var/mob/M)
/obj/structure/ghost_pod/manual/human/create_occupant(mob/M)
..()
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = new(src)
code/game/objects/structures/ghost_pods/mysterious.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/obj/structure/ghost_pod/manual/corgi/trigger()
..(span_warning("\The [usr] places their hand on the rune!"), "is attempting to summon a corgi.")
/obj/structure/ghost_pod/manual/corgi/create_occupant(var/mob/M)
/obj/structure/ghost_pod/manual/corgi/create_occupant(mob/M)
lightning_strike(get_turf(src), cosmetic = TRUE)
density = FALSE
var/mob/living/simple_mob/animal/passive/dog/corgi/R = new(get_turf(src))
@@ -38,7 +38,7 @@
/obj/structure/ghost_pod/manual/cursedblade/trigger()
..(span_warning("\The [usr] attempts to pull out the sword!"), "is activating a cursed blade.")
/obj/structure/ghost_pod/manual/cursedblade/create_occupant(var/mob/M)
/obj/structure/ghost_pod/manual/cursedblade/create_occupant(mob/M)
density = FALSE
var/obj/item/melee/cursedblade/R = new(get_turf(src))
to_chat(M, span_notice("You are a " + span_bold("Cursed Sword") + ", discovered by a hapless explorer. \
code/game/objects/structures/ghost_pods/silicon.dm
+3 -3
View File
@@ -15,7 +15,7 @@
/obj/structure/ghost_pod/manual/lost_drone/trigger()
..(span_notice("\The [src] appears to be attempting to restart the robot contained inside."), "is attempting to open \a [src].")
/obj/structure/ghost_pod/manual/lost_drone/create_occupant(var/mob/M)
/obj/structure/ghost_pod/manual/lost_drone/create_occupant(mob/M)
density = FALSE
var/mob/living/silicon/robot/malf/lost/randomlaws/R = new(get_turf(src))
R.adjustBruteLoss(rand(5, 30))
@@ -45,7 +45,7 @@
ghost_query_type = /datum/ghost_query/gravekeeper_drone
needscharger = TRUE
/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(mob/M)
density = FALSE
var/mob/living/silicon/robot/malf/gravekeeper/R = new(get_turf(src))
if(M.mind)
@@ -69,7 +69,7 @@
var/drone_class = "general"
var/drone_type = /mob/living/silicon/robot/drone/swarm
/obj/structure/ghost_pod/ghost_activated/swarm_drone/create_occupant(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/swarm_drone/create_occupant(mob/M)
var/mob/living/silicon/robot/drone/swarm/R = new drone_type(get_turf(src))
if(M.mind)
M.mind.transfer_to(R)
code/game/objects/structures/ghost_pods/silicon_vr.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/structure/ghost_pod/manual/lost_drone/dogborg // name is just legacy now
remains_active = TRUE
/obj/structure/ghost_pod/manual/lost_drone/dogborg/create_occupant(var/mob/M)
/obj/structure/ghost_pod/manual/lost_drone/dogborg/create_occupant(mob/M)
var/response = tgui_alert(M, "What sort of laws do you wish to have as Lost Drone (they will still be random)", "Drone Type", list("Regular", "Vore"))
if(!(response == "Vore")) // No response somehow or Regular
return ..()
code/game/objects/structures/ghost_pods/survivor.dm
+1 -1
View File
@@ -58,7 +58,7 @@
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/radio/headset
/obj/structure/ghost_pod/manual/survivor/create_occupant(var/mob/M)
/obj/structure/ghost_pod/manual/survivor/create_occupant(mob/M)
..()
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = new(src)
code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
+4 -4
View File
@@ -15,7 +15,7 @@
attack_ghost(user)
//override the standard attack_ghost proc for custom messages
/obj/structure/ghost_pod/ghost_activated/unified_hole/attack_ghost(var/mob/observer/dead/user)
/obj/structure/ghost_pod/ghost_activated/unified_hole/attack_ghost(mob/observer/dead/user)
var/choice
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot use this spawnpoint because you are banned from playing ghost roles."))
@@ -48,7 +48,7 @@
update_icon()
GLOB.active_ghost_pods -= src
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_simplemob(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_simplemob(mob/M)
var/choice
var/finalized = FALSE
GLOB.active_ghost_pods -= src
@@ -90,7 +90,7 @@
newPred.vore_selected = newPred.vore_organs[1]
qdel(src)
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_morph(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_morph(mob/M)
GLOB.active_ghost_pods -= src
var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src))
newMorph.voremob_loaded = TRUE // On-demand belly loading.
@@ -112,7 +112,7 @@
newMorph.vore_selected = newMorph.vore_organs[1]
qdel(src)
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_lurker(var/mob/M)
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_lurker(mob/M)
var/picked_ckey = M.ckey
var/picked_slot = M.client.prefs.default_slot
GLOB.active_ghost_pods -= src
code/game/objects/structures/girders.dm
+5 -5
View File
@@ -20,7 +20,7 @@
var/wall_type = /turf/simulated/wall
rad_insulation = RAD_VERY_LIGHT_INSULATION
/obj/structure/girder/Initialize(mapload, var/material_key)
/obj/structure/girder/Initialize(mapload, material_key)
. = ..()
if(!material_key)
material_key = default_material
@@ -56,7 +56,7 @@
return total_radiation
/obj/structure/girder/proc/set_material(var/datum/material/new_material)
/obj/structure/girder/proc/set_material(datum/material/new_material)
girder_material = new_material
name = "[girder_material.display_name] [initial(name)]"
max_health = round(girder_material.integrity) //Should be 150 with default integrity (steel). Weaker than ye-olden Girders now.
@@ -95,7 +95,7 @@
health = (displaced_health - round(current_damage / 4))
cover = 25
/obj/structure/girder/attack_generic(var/mob/user, var/damage, var/attack_message = "smashes apart")
/obj/structure/girder/attack_generic(mob/user, damage, attack_message = "smashes apart")
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return 0
user.do_attack_animation(src)
@@ -103,7 +103,7 @@
spawn(1) dismantle()
return 1
/obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/girder/bullet_act(obj/item/projectile/Proj)
//Girders only provide partial cover. There's a chance that the projectiles will just pass through. (unless you are trying to shoot the girder)
if(Proj.original != src && !prob(cover))
return PROJECTILE_CONTINUE //pass through
@@ -229,7 +229,7 @@
else
return ..()
/obj/structure/girder/take_damage(var/damage)
/obj/structure/girder/take_damage(damage)
health -= damage
if(health <= 0)
dismantle()
code/game/objects/structures/gravemarker.dm
+3 -3
View File
@@ -18,7 +18,7 @@
var/datum/material/material
/obj/structure/gravemarker/Initialize(mapload, var/material_name)
/obj/structure/gravemarker/Initialize(mapload, material_name)
. = ..()
if(!material_name)
material_name = MAT_WOOD
@@ -75,7 +75,7 @@
dismantle()
..()
/obj/structure/gravemarker/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/gravemarker/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage)
return
@@ -99,7 +99,7 @@
qdel(src)
return
/obj/structure/gravemarker/proc/damage(var/damage)
/obj/structure/gravemarker/proc/damage(damage)
health -= damage
if(health <= 0)
visible_message(span_danger("\The [src] falls apart!"))
code/game/objects/structures/grille.dm
+3 -3
View File
@@ -55,7 +55,7 @@
return prob(30)
return !density
/obj/structure/grille/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/grille/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
//Flimsy grilles aren't so great at stopping projectiles. However they can absorb some of the impact
@@ -212,7 +212,7 @@
healthcheck()
..()
/obj/structure/grille/attack_generic(var/mob/user, var/damage, var/attack_verb)
/obj/structure/grille/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
user.do_attack_animation(src)
health -= damage
@@ -287,7 +287,7 @@
qdel(src)
return TRUE
/obj/structure/grille/take_damage(var/damage)
/obj/structure/grille/take_damage(damage)
health -= damage
spawn(1) healthcheck()
return 1
code/game/objects/structures/holoplant.dm
+4 -4
View File
@@ -14,7 +14,7 @@
. = ..()
activate()
/obj/machinery/holoplant/attack_hand(var/mob/living/user)
/obj/machinery/holoplant/attack_hand(mob/living/user)
if(!istype(user) || interference)
return
@@ -27,7 +27,7 @@
else
deactivate()
/obj/machinery/holoplant/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/machinery/holoplant/attackby(obj/item/O as obj, mob/user as mob)
if(default_unfasten_wrench(user, O, 10))
deactivate()
return
@@ -73,7 +73,7 @@
set_light(2)
interference = FALSE
/obj/machinery/holoplant/proc/prepare_icon(var/state)
/obj/machinery/holoplant/proc/prepare_icon(state)
if(!state)
state = pick(GLOB.possible_plants)
var/plant_icon = icon(icon, state)
@@ -88,7 +88,7 @@
deactivate()
activate()
/obj/machinery/holoplant/Crossed(var/mob/living/L)
/obj/machinery/holoplant/Crossed(mob/living/L)
if(!interference && plant && istype(L))
flicker()
code/game/objects/structures/holosign.dm
+1 -1
View File
@@ -37,7 +37,7 @@
playsound(loc, 'sound/weapons/egloves.ogg', 80, 1)
take_damage(W.force)
/obj/structure/holosign/take_damage(var/damage)
/obj/structure/holosign/take_damage(damage)
health -= damage
spawn(1) healthcheck()
return 1
code/game/objects/structures/inflatable.dm
+6 -6
View File
@@ -17,7 +17,7 @@
return FALSE
inflate(user,user.loc)
/obj/item/inflatable/afterattack(var/atom/A, var/mob/user)
/obj/item/inflatable/afterattack(atom/A, mob/user)
..(A, user)
if(!user)
return
@@ -49,7 +49,7 @@
update_nearby_tiles()
return ..()
/obj/structure/inflatable/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/inflatable/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage) return
@@ -90,7 +90,7 @@
..()
return
/obj/structure/inflatable/proc/hit(var/damage, var/sound_effect = 1)
/obj/structure/inflatable/proc/hit(damage, sound_effect = 1)
health = max(0, health - damage)
if(sound_effect)
playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
@@ -100,7 +100,7 @@
/obj/structure/inflatable/click_ctrl()
hand_deflate()
/obj/item/inflatable/proc/inflate(var/mob/user,var/location)
/obj/item/inflatable/proc/inflate(mob/user,location)
playsound(location, 'sound/items/zip.ogg', 75, 1)
to_chat(user, span_notice("You inflate [src]."))
var/obj/structure/inflatable/R = new deploy_path(location)
@@ -135,7 +135,7 @@
verbs -= /obj/structure/inflatable/verb/hand_deflate
deflate()
/obj/structure/inflatable/attack_generic(var/mob/user, var/damage, var/attack_verb)
/obj/structure/inflatable/attack_generic(mob/user, damage, attack_verb)
health -= damage
user.do_attack_animation(src)
if(health <= 0)
@@ -145,7 +145,7 @@
user.visible_message(span_danger("[user] [attack_verb] at [src]!"))
return 1
/obj/structure/inflatable/take_damage(var/damage)
/obj/structure/inflatable/take_damage(damage)
health -= damage
if(health <= 0)
visible_message(span_danger("The [src] deflates!"))
code/game/objects/structures/janicart.dm
+2 -2
View File
@@ -311,7 +311,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
add_overlay("cart_sign[signs]")
//This is called if the cart is caught in an explosion, or destroyed by weapon fire
/obj/structure/janitorialcart/proc/spill(var/chance = 100)
/obj/structure/janitorialcart/proc/spill(chance = 100)
var/turf/dropspot = get_turf(src)
if (mymop && prob(chance))
mymop.forceMove(dropspot)
@@ -355,7 +355,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
/obj/structure/janitorialcart/proc/dismantle(var/mob/user = null)
/obj/structure/janitorialcart/proc/dismantle(mob/user = null)
if (!dismantled)
if (has_items)
spill()
code/game/objects/structures/kitchen_foodcart_vr.dm
+1 -1
View File
@@ -22,7 +22,7 @@
else
return
/obj/structure/foodcart/attack_hand(var/mob/user as mob)
/obj/structure/foodcart/attack_hand(mob/user as mob)
if(contents.len)
var/obj/item/reagent_containers/food/choice = tgui_input_list(user, "What would you like to grab from the cart?", "Grab Choice", contents)
if(choice)
code/game/objects/structures/kitchen_spike.dm
+1 -1
View File
@@ -27,7 +27,7 @@
else
to_chat(user, span_danger("They are too big for the spike, try something smaller!"))
/obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
/obj/structure/kitchenspike/proc/spike(mob/living/victim)
if(!istype(victim))
return
code/game/objects/structures/loot_piles.dm
+1 -1
View File
@@ -28,7 +28,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
var/busy = FALSE // Used so you can't spamclick to loot.
var/loot_element_path = null
/obj/structure/loot_pile/attack_ai(var/mob/user)
/obj/structure/loot_pile/attack_ai(mob/user)
if(isrobot(user) && Adjacent(user))
return attack_hand(user)
code/game/objects/structures/low_wall.dm
+4 -4
View File
@@ -27,7 +27,7 @@
var/datum/material/material
var/grille_type
/obj/structure/low_wall/Initialize(mapload, var/materialtype)
/obj/structure/low_wall/Initialize(mapload, materialtype)
. = ..()
icon_state = "blank"
var/turf/T = loc
@@ -72,7 +72,7 @@
else
to_chat(user, span_danger("It's nearly falling to pieces."))
/obj/structure/low_wall/attackby(var/obj/item/W, var/mob/user, var/hit_modifier, var/click_parameters)
/obj/structure/low_wall/attackby(obj/item/W, mob/user, hit_modifier, click_parameters)
src.add_fingerprint(user)
// Making grilles (only works on Bay ones currently)
@@ -251,7 +251,7 @@
I.color = main_color
add_overlay(I)
/obj/structure/low_wall/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/low_wall/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
var/damage = min(proj_damage, 100)
take_damage(damage)
@@ -276,7 +276,7 @@
if(health <= 0)
dismantle()
/obj/structure/low_wall/attack_generic(var/mob/user, var/damage, var/attack_verb)
/obj/structure/low_wall/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
user.do_attack_animation(src)
take_damage(damage)
code/game/objects/structures/medical_stand_vr.dm
+6 -6
View File
@@ -90,11 +90,11 @@
beaker = null
return ..()
/obj/structure/medical_stand/attack_robot(var/mob/user)
/obj/structure/medical_stand/attack_robot(mob/user)
if(Adjacent(user))
attack_hand(user)
/obj/structure/medical_stand/MouseDrop(var/mob/living/carbon/human/target, src_location, over_location)
/obj/structure/medical_stand/MouseDrop(mob/living/carbon/human/target, src_location, over_location)
..()
if(istype(target))
if(usr.stat == DEAD || !CanMouseDrop(target))
@@ -244,7 +244,7 @@
if(N)
transfer_amount = N
/obj/structure/medical_stand/proc/attach_mask(var/mob/living/carbon/C)
/obj/structure/medical_stand/proc/attach_mask(mob/living/carbon/C)
if(C && istype(C))
if(C.equip_to_slot_if_possible(contained, slot_wear_mask))
if(tank)
@@ -252,7 +252,7 @@
breather = C
return TRUE
/obj/structure/medical_stand/proc/can_apply_to_target(var/mob/living/carbon/human/target, var/mob/user)
/obj/structure/medical_stand/proc/can_apply_to_target(mob/living/carbon/human/target, mob/user)
if(!user)
user = target
// Check target validity
@@ -289,7 +289,7 @@
return
return 1
/obj/structure/medical_stand/attackby(var/obj/item/W, var/mob/user)
/obj/structure/medical_stand/attackby(obj/item/W, mob/user)
if(istype (W, /obj/item/tool))
if (valve_opened)
to_chat(user, span_warning("Close the valve first."))
@@ -335,7 +335,7 @@
else
return ..()
/obj/structure/medical_stand/examine(var/mob/user)
/obj/structure/medical_stand/examine(mob/user)
. = ..()
if (get_dist(src, user) > 2)
code/game/objects/structures/mirror.dm
+4 -4
View File
@@ -12,7 +12,7 @@
var/glass = 1
var/datum/tgui_module/appearance_changer/mirror/M
/obj/structure/mirror/Initialize(mapload, var/dir, var/building = 0)
/obj/structure/mirror/Initialize(mapload, dir, building = 0)
. = ..()
M = new(src, null)
if(building)
@@ -47,7 +47,7 @@
desc = "Oh no, seven years of bad luck!"
/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/mirror/bullet_act(obj/item/projectile/Proj)
if(prob(Proj.get_structure_damage() * 2))
if(!shattered)
@@ -107,7 +107,7 @@
visible_message(span_warning("[user] hits [src] with [I]!"))
playsound(src, 'sound/effects/Glasshit.ogg', 70, 1)
/obj/structure/mirror/attack_generic(var/mob/user, var/damage)
/obj/structure/mirror/attack_generic(mob/user, damage)
user.do_attack_animation(src)
if(shattered && glass)
@@ -129,7 +129,7 @@
icon_state = "mirror_broke"
shattered = 1
/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
/obj/structure/mirror/raider/attack_hand(mob/living/carbon/human/user)
if(istype(get_area(src),/area/syndicate_mothership))
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != SPECIES_VOX && is_alien_whitelisted(user.client, SPECIES_VOX))
var/choice = tgui_alert(user, "Do you wish to become a true Vox of the Shoal? This is not reversible.", "Become Vox?", list("No","Yes"))
code/game/objects/structures/morgue.dm
+1 -1
View File
@@ -35,7 +35,7 @@
for(var/obj/structure/closet/body_bag/B in contents)
occupants += B.get_occupants()
/obj/structure/morgue/proc/update(var/broadcast=0)
/obj/structure/morgue/proc/update(broadcast=0)
if (src.connected)
src.icon_state = "morgue0"
else
code/game/objects/structures/pillows.dm
+1 -1
View File
@@ -23,7 +23,7 @@
..()
icon_state = initial(icon_state)
/obj/item/bedsheet/pillow/attackby(var/obj/item/component, mob/user as mob)
/obj/item/bedsheet/pillow/attackby(obj/item/component, mob/user as mob)
if (istype(component,src))
to_chat(user, span_notice("You assemble a pillow pile!"))
user.drop_item()
code/game/objects/structures/props/beam_prism.dm
+2 -2
View File
@@ -89,7 +89,7 @@
else
animate(src, transform = turn(src.transform, rotate_degrees), time = 6) //Can't update transform because it will reset the angle.
/obj/structure/prop/prism/proc/rotate_auto(var/new_bearing)
/obj/structure/prop/prism/proc/rotate_auto(new_bearing)
if(rotation_lock)
visible_message(span_infoplain(span_bold("\The [src]") + " shudders."))
playsound(src, 'sound/effects/clang.ogg', 50, 1)
@@ -117,7 +117,7 @@
else
animate(src, transform = turn(src.transform, rotate_degrees), time = 6)
/obj/structure/prop/prism/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/prop/prism/bullet_act(obj/item/projectile/Proj)
if(istype(Proj, redirect_type))
visible_message(span_danger("\The [src] redirects \the [Proj]!"))
flick("[initial(icon_state)]+glow", src)
code/game/objects/structures/props/machines.dm
+4 -4
View File
@@ -615,7 +615,7 @@
/obj/structure/prop/machine/nt_pod/Entered(atom/movable/mover)
abduct(mover)
/obj/structure/prop/machine/nt_pod/proc/abduct(var/atom/movable/AM)
/obj/structure/prop/machine/nt_pod/proc/abduct(atom/movable/AM)
// Save old settings
contents_vis_flags = AM.vis_flags
contents_original_pixel_y = AM.pixel_y
@@ -632,7 +632,7 @@
// TRAP THEM
change_state("closed")
/obj/structure/prop/machine/nt_pod/proc/unduct(var/atom/movable/AM)
/obj/structure/prop/machine/nt_pod/proc/unduct(atom/movable/AM)
// Geddout
vis_contents -= AM
if(ismob(AM))
@@ -644,7 +644,7 @@
AM.vis_flags = contents_vis_flags
AM.pixel_y = contents_original_pixel_y
/obj/structure/prop/machine/nt_pod/MouseDrop_T(var/atom/movable/AM, var/mob/user)
/obj/structure/prop/machine/nt_pod/MouseDrop_T(atom/movable/AM, mob/user)
if(contents.len)
return
if(!ismovable(AM))
@@ -694,7 +694,7 @@
// Old Virology stuff
/obj/structure/prop/machine/nt_pod/proc/delayed_flick(var/obj/effect/overlay/ovrl, var/icon_state, var/flicked, var/get_out_time)
/obj/structure/prop/machine/nt_pod/proc/delayed_flick(obj/effect/overlay/ovrl, icon_state, flicked, get_out_time)
ovrl.icon_state = icon_state
flick(flicked, ovrl)
// GET OUT
code/game/objects/structures/props/nest.dm
+2 -2
View File
@@ -44,7 +44,7 @@
if(world.time > last_spawn + spawn_delay)
spawn_creature(get_turf(src))
/obj/structure/prop/nest/proc/spawn_creature(var/turf/spawnpoint)
/obj/structure/prop/nest/proc/spawn_creature(turf/spawnpoint)
update_creatures() //Paranoia.
if(total_creature_max && tally >= total_creature_max)
return
@@ -58,7 +58,7 @@
den_mobs += L
tally++
/obj/structure/prop/nest/proc/remove_creature(var/mob/target)
/obj/structure/prop/nest/proc/remove_creature(mob/target)
den_mobs -= target
/obj/structure/prop/nest/proc/update_creatures()
code/game/objects/structures/props/projectile_lock.dm
+1 -1
View File
@@ -39,7 +39,7 @@
interaction_message = span_notice("The object remains inert to your touch.")
/obj/structure/prop/lock/projectile/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/prop/lock/projectile/bullet_act(obj/item/projectile/Proj)
if(!istype(Proj, projectile_key) || timing)
return
code/game/objects/structures/props/puzzledoor.dm
+3 -3
View File
@@ -27,7 +27,7 @@
return 0
return 1
/obj/machinery/door/blast/puzzle/bullet_act(var/obj/item/projectile/Proj)
/obj/machinery/door/blast/puzzle/bullet_act(obj/item/projectile/Proj)
if(!istype(Proj, /obj/item/projectile/test))
visible_message(span_cult("\The [src] is completely unaffected by \the [Proj]."))
qdel(Proj) //No piercing. No.
@@ -88,11 +88,11 @@
qdel(C)
return 0
/obj/machinery/door/blast/puzzle/attack_generic(var/mob/user, var/damage)
/obj/machinery/door/blast/puzzle/attack_generic(mob/user, damage)
if(check_locks())
force_toggle(1, user)
/obj/machinery/door/blast/puzzle/attack_alien(var/mob/user)
/obj/machinery/door/blast/puzzle/attack_alien(mob/user)
if(check_locks())
force_toggle(1, user)
code/game/objects/structures/props/swarm.dm
+4 -4
View File
@@ -32,7 +32,7 @@
active_beams = null
. = ..()
/obj/structure/cult/pylon/swarm/pylonhit(var/damage)
/obj/structure/cult/pylon/swarm/pylonhit(damage)
if(!isbroken)
if(prob(1 + damage * 3))
visible_message(span_danger("[shatter_message]"))
@@ -43,7 +43,7 @@
icon_state = "[initial(icon_state)]-broken"
set_light(0)
/obj/structure/cult/pylon/swarm/attackpylon(mob/user as mob, var/damage)
/obj/structure/cult/pylon/swarm/attackpylon(mob/user as mob, damage)
if(!isbroken)
if(prob(1 + damage * 3))
user.visible_message(
@@ -112,7 +112,7 @@
description_info = "An infinitely small point in space spread upon infinitely many finitely-bounded points in space. Nice."
/obj/structure/cult/pylon/swarm/defender/pylonhit(var/damage)
/obj/structure/cult/pylon/swarm/defender/pylonhit(damage)
if(!isbroken)
if(prob(1 + damage * 3) && damage >= 25)
visible_message(span_danger("[shatter_message]"))
@@ -123,7 +123,7 @@
icon_state = "[initial(icon_state)]-broken"
set_light(0)
/obj/structure/cult/pylon/swarm/defender/attackpylon(mob/user as mob, var/damage)
/obj/structure/cult/pylon/swarm/defender/attackpylon(mob/user as mob, damage)
if(!isbroken)
if(prob(1 + damage * 2) && damage >= 15)
user.visible_message(
code/game/objects/structures/railing.dm
+2 -2
View File
@@ -70,7 +70,7 @@
new /obj/item/stack/rods(get_turf(src))
qdel(src)
/obj/structure/railing/proc/NeighborsCheck(var/UpdateNeighbors = 1)
/obj/structure/railing/proc/NeighborsCheck(UpdateNeighbors = 1)
check = 0
//if (!anchored) return
var/Rturn = turn(src.dir, -90)
@@ -108,7 +108,7 @@
if (UpdateNeighbors)
R.update_icon(0)
/obj/structure/railing/update_icon(var/UpdateNeighgors = 1)
/obj/structure/railing/update_icon(UpdateNeighgors = 1)
NeighborsCheck(UpdateNeighgors)
//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do
cut_overlays()
code/game/objects/structures/safe.dm
+1 -1
View File
@@ -184,7 +184,7 @@ FLOOR SAFES
hide(1)
update_icon()
/obj/structure/safe/floor/hide(var/intact)
/obj/structure/safe/floor/hide(intact)
invisibility = intact ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
/obj/structure/safe/floor/hides_under_flooring()
code/game/objects/structures/signs.dm
+2 -2
View File
@@ -1541,7 +1541,7 @@
icon_state = "flag"
flagtype = /obj/item/flag
/obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
/obj/item/flag/afterattack(atom/A, mob/user, adjacent, clickparams)
if (!adjacent)
return
@@ -1638,7 +1638,7 @@
add_fingerprint(user)
rip()
/obj/structure/sign/flag/proc/rip(var/rip_linked = TRUE)
/obj/structure/sign/flag/proc/rip(rip_linked = TRUE)
var/icon/I = new('icons/obj/flags.dmi', icon_state)
var/icon/mask = new('icons/obj/flags.dmi', "ripped")
I.AddAlphaMask(mask)
code/game/objects/structures/simple_doors.dm
+24 -24
View File
@@ -32,7 +32,7 @@
hardness -= material.combustion_effect(get_turf(src),temperature, 0.3)
CheckHardness()
/obj/structure/simple_door/Initialize(mapload, var/material_name)
/obj/structure/simple_door/Initialize(mapload, material_name)
. = ..()
set_material(material_name)
if(!material)
@@ -43,7 +43,7 @@
update_nearby_tiles()
return ..()
/obj/structure/simple_door/proc/set_material(var/material_name)
/obj/structure/simple_door/proc/set_material(material_name)
if(!material_name)
material_name = MAT_STEEL
material = get_material_by_name(material_name)
@@ -194,15 +194,15 @@
attack_hand(user)
return
/obj/structure/simple_door/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/simple_door/bullet_act(obj/item/projectile/Proj)
take_damage(Proj.damage/10)
CheckHardness()
/obj/structure/simple_door/take_damage(var/damage)
/obj/structure/simple_door/take_damage(damage)
hardness -= damage/10
CheckHardness()
/obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb)
/obj/structure/simple_door/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
@@ -250,19 +250,19 @@
strength = material.radioactivity
)
/obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
/obj/structure/simple_door/iron/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_IRON)
/obj/structure/simple_door/silver
rad_insulation = RAD_HEAVY_INSULATION
/obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
/obj/structure/simple_door/silver/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_SILVER)
/obj/structure/simple_door/gold
rad_insulation = RAD_HEAVY_INSULATION
/obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
/obj/structure/simple_door/gold/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_GOLD)
/obj/structure/simple_door/uranium
@@ -271,7 +271,7 @@
/// Mutex to prevent infinite recursion when propagating radiation pulses
var/active = null
/obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
/obj/structure/simple_door/uranium/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_URANIUM)
START_PROCESSING(SSobj, src)
@@ -293,61 +293,61 @@
last_event = world.time
active = FALSE
/obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
/obj/structure/simple_door/sandstone/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_SANDSTONE)
/obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
/obj/structure/simple_door/phoron/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_PHORON)
/obj/structure/simple_door/diamond
rad_insulation = RAD_EXTREME_INSULATION
/obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
/obj/structure/simple_door/diamond/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_DIAMOND)
//I was going to give wooden doors RAD_VERY_LIGHT_INSULATION but they need a proper parent instead of this garbage.
/obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/wood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_WOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/hardwood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/hardwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_HARDWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/sifwood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/sifwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_SIFWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/birchwood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/birchwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_BIRCHWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/pinewood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/pinewood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_PINEWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/oakwood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/oakwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_OAKWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/acaciawood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/acaciawood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_ACACIAWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/redwood/Initialize(mapload,var/material_name)
/obj/structure/simple_door/redwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_REDWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
/obj/structure/simple_door/resin/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_RESIN)
/obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
/obj/structure/simple_door/cult/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/glamour/Initialize(mapload,var/material_name)
/obj/structure/simple_door/glamour/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_GLAMOUR)
/obj/structure/simple_door/snowbrick/Initialize(mapload, var/material_name)
/obj/structure/simple_door/snowbrick/Initialize(mapload, material_name)
. = ..(mapload, material_name || MAT_SNOWBRICK)
code/game/objects/structures/simple_doors_vr.dm
+1 -1
View File
@@ -21,5 +21,5 @@
icon = 'icons/goonstation/featherzone.dmi'
icon_state = "flockdoor"
/obj/structure/simple_door/flock/Initialize(mapload, var/newmat)
/obj/structure/simple_door/flock/Initialize(mapload, newmat)
. = ..(mapload, MAT_FLOKIUM)
code/game/objects/structures/stasis_cage.dm
+4 -4
View File
@@ -15,14 +15,14 @@
if(A)
contain(A)
/obj/structure/stasis_cage/attack_hand(var/mob/user)
/obj/structure/stasis_cage/attack_hand(mob/user)
release()
/obj/structure/stasis_cage/attack_robot(var/mob/user)
/obj/structure/stasis_cage/attack_robot(mob/user)
if(Adjacent(user))
release()
/obj/structure/stasis_cage/proc/contain(var/mob/living/simple_mob/animal)
/obj/structure/stasis_cage/proc/contain(mob/living/simple_mob/animal)
if(contained || !istype(animal))
return
@@ -52,7 +52,7 @@
return ..()
/mob/living/simple_mob/MouseDrop(var/obj/structure/stasis_cage/over_object)
/mob/living/simple_mob/MouseDrop(obj/structure/stasis_cage/over_object)
if(istype(over_object) && Adjacent(over_object) && CanMouseDrop(over_object, usr))
if(!src.buckled || !istype(src.buckled, /obj/effect/energy_net))
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+2 -2
View File
@@ -23,7 +23,7 @@
var/applies_material_colour = 1
var/flippable = TRUE
/obj/structure/bed/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/Initialize(mapload, new_material, new_padding_material)
..()
color = null
if(!new_material)
@@ -167,7 +167,7 @@
padding_material = null
update_icon()
/obj/structure/bed/proc/add_padding(var/padding_type)
/obj/structure/bed/proc/add_padding(padding_type)
padding_material = get_material_by_name(padding_type)
update_icon()
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+24 -24
View File
@@ -9,7 +9,7 @@
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/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/Initialize(mapload, new_material, new_padding_material)
. = ..()
update_layer()
@@ -99,37 +99,37 @@
I.color = padding_material.icon_colour
add_overlay(I)
/obj/structure/bed/chair/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BROWN)
/obj/structure/bed/chair/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/black/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/green/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/purp/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/purp/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/blue/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/beige/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/lime/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/orange/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/orange/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
@@ -138,37 +138,37 @@
icon_state = "roundedchair"
base_icon = "roundedchair"
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BROWN)
/obj/structure/bed/chair/comfy/rounded/red/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/black/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/green/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
@@ -332,7 +332,7 @@
color = null
var/padding_color = "#CC0000"
/obj/structure/bed/chair/sofa/bench/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/sofa/bench/Initialize(mapload, new_material, new_padding_material)
. = ..()
var/mutable_appearance/MA
// If we're north-facing, metal goes above mob, padding overlay goes below mob.
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+23 -23
View File
@@ -6,7 +6,7 @@
base_icon = "modern_chair"
applies_material_colour = 0
/obj/structure/bed/chair/modern_chair/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/modern_chair/Initialize(mapload, new_material, new_padding_material)
. = ..()
var/image/I = image(icon, "[base_icon]_over")
I.layer = ABOVE_MOB_LAYER
@@ -122,34 +122,34 @@
base_icon = "bay_chair"
buckle_movable = 1
/obj/structure/bed/chair/bay/chair/padded/red/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BROWN)
/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/black/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/green/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy
@@ -158,34 +158,34 @@
icon_state = "bay_comfychair_preview"
base_icon = "bay_comfychair"
/obj/structure/bed/chair/bay/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BROWN)
/obj/structure/bed/chair/bay/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/black/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/green/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/purple/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/purple/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/blue/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/beige/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/lime/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain
@@ -201,7 +201,7 @@
I.layer = ABOVE_MOB_LAYER
add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/comfy/captain/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle
@@ -213,7 +213,7 @@
var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = MAT_CLOTH_BLUE
/obj/structure/bed/chair/bay/shuttle/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/bay/shuttle/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/post_buckle_mob()
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+3 -3
View File
@@ -18,7 +18,7 @@
/obj/item/stool/padded
icon_state = "stool_padded_preview" //set for the map
/obj/item/stool/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/item/stool/Initialize(mapload, new_material, new_padding_material)
. = ..()
if(!new_material)
new_material = MAT_STEEL
@@ -31,7 +31,7 @@
force = round(material.get_blunt_damage()*0.4)
update_icon()
/obj/item/stool/padded/Initialize(mapload, var/new_material)
/obj/item/stool/padded/Initialize(mapload, new_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
/obj/item/stool/update_icon()
@@ -61,7 +61,7 @@
name = "[material.display_name] [initial(name)]"
desc = "A stool. Apply butt with care. It's made of [material.use_name]."
/obj/item/stool/proc/add_padding(var/padding_type)
/obj/item/stool/proc/add_padding(padding_type)
padding_material = get_material_by_name(padding_type)
update_icon()
code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
+1 -1
View File
@@ -15,5 +15,5 @@
/obj/item/stool/baystool/padded
icon_state = "bar_stool_padded_preview" //set for the map
/obj/item/stool/baystool/padded/Initialize(mapload, var/new_material)
/obj/item/stool/baystool/padded/Initialize(mapload, new_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/min_mob_buckle_size = MOB_SMALL
var/max_mob_buckle_size = MOB_LARGE
/obj/structure/bed/chair/wheelchair/Initialize(mapload, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/wheelchair/Initialize(mapload, new_material, new_padding_material)
. = ..()
update_icon()
code/game/objects/structures/trash_pile_vr.dm
+2 -2
View File
@@ -162,11 +162,11 @@
"trashbag",
"brokecomp")
/obj/structure/mob_spawner/mouse_nest/do_spawn(var/mob_path)
/obj/structure/mob_spawner/mouse_nest/do_spawn(mob_path)
. = ..()
var/atom/A = get_holder_at_turf_level(src)
A.visible_message("[.] crawls out of \the [src].")
/obj/structure/mob_spawner/mouse_nest/get_death_report(var/mob/living/L)
/obj/structure/mob_spawner/mouse_nest/get_death_report(mob/living/L)
..()
last_spawn = rand(world.time - spawn_delay, world.time)
code/game/objects/structures/under_wardrobe.dm
+6 -6
View File
@@ -9,13 +9,13 @@
. = ..()
AddElement(/datum/element/climbable)
/obj/structure/undies_wardrobe/attack_hand(var/mob/user)
/obj/structure/undies_wardrobe/attack_hand(mob/user)
if(!human_who_can_use_underwear(user))
to_chat(user, span_warning("Sadly there's nothing in here for you to wear."))
return
interact(user)
/obj/structure/undies_wardrobe/interact(var/mob/living/carbon/human/H)
/obj/structure/undies_wardrobe/interact(mob/living/carbon/human/H)
var/dat = list()
dat += span_bold("Underwear:") + "<br>"
for(var/datum/category_group/underwear/UWC in GLOB.global_underwear.categories)
@@ -30,7 +30,7 @@
dat = jointext(dat,null)
H << browse("<html>[dat]</html>", "window=wardrobe;size=400x200")
/obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt)
/obj/structure/undies_wardrobe/proc/get_metadata(mob/living/carbon/human/H, underwear_category, datum/gear_tweak/gt)
var/metadata = H.all_underwear_metadata[underwear_category]
if(!metadata)
metadata = list()
@@ -42,16 +42,16 @@
metadata["[gt]"] = tweak_data
return tweak_data
/obj/structure/undies_wardrobe/proc/set_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
/obj/structure/undies_wardrobe/proc/set_metadata(mob/living/carbon/human/H, underwear_category, datum/gear_tweak/gt, new_metadata)
var/list/metadata = H.all_underwear_metadata[underwear_category]
metadata["[gt]"] = new_metadata
/obj/structure/undies_wardrobe/proc/human_who_can_use_underwear(var/mob/living/carbon/human/H)
/obj/structure/undies_wardrobe/proc/human_who_can_use_underwear(mob/living/carbon/human/H)
if(!istype(H) || !H.species || !(H.species.appearance_flags & HAS_UNDERWEAR))
return FALSE
return TRUE
/obj/structure/undies_wardrobe/CanUseTopic(var/user)
/obj/structure/undies_wardrobe/CanUseTopic(user)
if(!human_who_can_use_underwear(user))
return STATUS_CLOSE
code/game/objects/structures/watercloset.dm
+2 -2
View File
@@ -708,7 +708,7 @@
user.forceMove(src)
to_chat(user, span_vnotice("You have been swallowed alive by the rubber ducky. Your entire body compacted up and squeezed into the tiny space that makes up the oddly realistic and not at all rubbery stomach. The walls themselves are kneading over you, grinding some sort of fluids into your trapped body. You can even hear the sound of bodily functions echoing around you..."))
/obj/item/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee)
/obj/item/bikehorn/rubberducky/pink/container_resist(mob/living/escapee)
if(isdisposalpacket(loc))
escapee.forceMove(loc)
else
@@ -909,7 +909,7 @@
AddComponent(/datum/component/hose_connector/endless_source/water)
AddComponent(/datum/component/hose_connector/endless_drain)
/obj/structure/sink/MouseDrop_T(var/obj/item/thing, var/mob/user)
/obj/structure/sink/MouseDrop_T(obj/item/thing, mob/user)
..()
if(!istype(thing) || !thing.is_open_container())
return ..()
code/game/objects/structures/window.dm
+7 -7
View File
@@ -51,7 +51,7 @@
/obj/structure/window/examine_icon()
return icon(icon=initial(icon),icon_state=initial(icon_state))
/obj/structure/window/take_damage(var/damage = 0, var/sound_effect = 1)
/obj/structure/window/take_damage(damage = 0, sound_effect = 1)
var/initialhealth = health
if(silicate)
@@ -75,7 +75,7 @@
update_icon()
return
/obj/structure/window/proc/apply_silicate(var/amount)
/obj/structure/window/proc/apply_silicate(amount)
if(health < maxhealth) // Mend the damage
health = min(health + amount * 3, maxhealth)
if(health == maxhealth)
@@ -93,7 +93,7 @@
img.alpha = silicate * 255 / 100
add_overlay(img)
/obj/structure/window/proc/shatter(var/display_message = 1)
/obj/structure/window/proc/shatter(display_message = 1)
playsound(src, "shatter", 70, 1)
if(display_message)
visible_message("[src] shatters!")
@@ -111,7 +111,7 @@
PROTECTED_PROC(TRUE)
return TRUE
/obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/window/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage) return
@@ -213,7 +213,7 @@
"You hear a knocking sound.")
return
/obj/structure/window/attack_generic(var/mob/user, var/damage)
/obj/structure/window/attack_generic(mob/user, damage)
user.setClickCooldown(user.get_attack_speed())
if(!damage)
return
@@ -343,7 +343,7 @@
..()
return
/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
/obj/structure/window/proc/hit(damage, sound_effect = 1)
if(damage < force_threshold || force_threshold < 0)
return
if(reinf) damage *= 0.5
@@ -412,7 +412,7 @@
/obj/structure/window/proc/is_fulltile()
return fulltile
/obj/structure/window/is_between_turfs(var/turf/origin, var/turf/target)
/obj/structure/window/is_between_turfs(turf/origin, turf/target)
if(is_fulltile())
return TRUE
return ..()
code/game/objects/structures/window_spawner.dm
+4 -4
View File
@@ -60,11 +60,11 @@
if((flags & ATOM_INITIALIZED) && !QDELETED(src))
qdel(src)
/obj/effect/wingrille_spawn/proc/handle_window_spawn(var/obj/structure/window/W)
/obj/effect/wingrille_spawn/proc/handle_window_spawn(obj/structure/window/W)
return
// Currently unused, could be useful for pre-wired electrified windows.
/obj/effect/wingrille_spawn/proc/handle_grille_spawn(var/obj/structure/grille/G)
/obj/effect/wingrille_spawn/proc/handle_grille_spawn(obj/structure/grille/G)
return
/obj/effect/wingrille_spawn/reinforced
@@ -77,7 +77,7 @@
icon_state = "r-wingrille"
win_path = /obj/structure/window/reinforced
/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(var/obj/structure/window/W)
/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(obj/structure/window/W)
W.maxhealth = 1000000
W.health = 1000000
@@ -97,6 +97,6 @@
win_path = /obj/structure/window/reinforced/polarized
var/id
/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(var/obj/structure/window/reinforced/polarized/P)
/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(obj/structure/window/reinforced/polarized/P)
if(id)
P.id = id