cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-24 21:47:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup the last

Browse Source
This commit is contained in:
Kashargul
2024-12-08 20:54:28 +01:00
parent 99f21e40a3
commit 8d6bf161a8
76 changed files with 356 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barricades.dm
+3 -3
View File
@@ -13,7 +13,7 @@
/obj/structure/barricade/New(var/newloc, var/material_name)
..(newloc)
if(!material_name)
material_name = "wood"
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
qdel(src)
@@ -72,7 +72,7 @@
/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name("resin"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_CLOTH) || get_material_by_name(MAT_SYNCLOTH)))
playsound(src, 'sound/items/drop/clothing.ogg', 100, 1)
@@ -118,7 +118,7 @@
/obj/structure/barricade/sandbag/New(var/newloc, var/material_name)
if(!material_name)
material_name = "cloth"
material_name = MAT_CLOTH
..(newloc, material_name)
material = get_material_by_name("[material_name]")
if(!material)
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -363,7 +363,7 @@
max_health = 225
health = 225
cover = 60
girder_material = "resin"
girder_material = MAT_RESIN
/obj/structure/girder/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
var/turf/simulated/T = get_turf(src)
code/game/objects/structures/gravemarker.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/obj/structure/gravemarker/New(var/newloc, var/material_name)
..(newloc)
if(!material_name)
material_name = "wood"
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
qdel(src)
code/game/objects/structures/simple_doors.dm
+2 -2
View File
@@ -177,7 +177,7 @@
else if(istype(W,/obj/item) && breakable) //not sure, can't not just weapons get passed to this proc?
hardness -= W.force/10
visible_message(span_danger("[user] hits [src] with [W]!"))
if(material == get_material_by_name("resin"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD)))
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
@@ -202,7 +202,7 @@
/obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name("resin"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD)))
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+4 -4
View File
@@ -104,7 +104,7 @@
return
var/padding_type //This is awful but it needs to be like this until tiles are given a material var.
if(istype(W,/obj/item/stack/tile/carpet))
padding_type = "carpet"
padding_type = MAT_CARPET
else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/M = W
if(M.material && (M.material.flags & MATERIAL_PADDING))
@@ -200,10 +200,10 @@
base_icon = "psychbed"
/obj/structure/bed/psych/New(var/newloc)
..(newloc,"wood","leather")
..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/padded/New(var/newloc)
..(newloc,"plastic","cotton")
..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/double
name = "double bed"
@@ -211,7 +211,7 @@
base_icon = "doublebed"
/obj/structure/bed/double/padded/New(var/newloc)
..(newloc,"wood","cotton")
..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
if(M.buckled == src)
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+64 -64
View File
@@ -131,34 +131,34 @@
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "teal")
..(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, "black")
..(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, "green")
..(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, "purple")
..(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, "blue")
..(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, "beige")
..(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, "lime")
..(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, "yellow")
..(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, "orange")
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
name = "rounded chair"
@@ -170,34 +170,34 @@
..(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, "carpet")
..(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, "teal")
..(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, "black")
..(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, "green")
..(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, "purple")
..(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, "blue")
..(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, "beige")
..(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, "lime")
..(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, "yellow")
..(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, "orange")
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
anchored = FALSE
@@ -278,7 +278,7 @@
..()
/obj/structure/bed/chair/wood/New(var/newloc)
..(newloc, "wood")
..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/wings
icon_state = "wooden_chair_wings"
@@ -292,7 +292,7 @@
base_icon = "sofamiddle"
icon_state = "sofamiddle"
applies_material_colour = 1
var/sofa_material = "carpet"
var/sofa_material = MAT_CARPET
var/corner_piece = FALSE
/obj/structure/bed/chair/sofa/update_icon()
@@ -300,7 +300,7 @@
var/datum/material/color_material = get_material_by_name(sofa_material)
color = color_material.icon_colour
if(sofa_material == "carpet")
if(sofa_material == MAT_CARPET)
name = "red [initial(name)]"
else
name = "[sofa_material] [initial(name)]"
@@ -415,37 +415,37 @@
//color variations
//Middle sofas first
/obj/structure/bed/chair/sofa
sofa_material = "carpet"
sofa_material = MAT_CARPET
/obj/structure/bed/chair/sofa/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
//sofa directions
@@ -459,91 +459,91 @@
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/left/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/right/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/corner/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/left/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/right/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/corner/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/left/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/right/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/corner/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/left/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/right/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/corner/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/left/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/right/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/corner/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/left/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/right/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/corner/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/left/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/right/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/corner/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/left/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/right/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/corner/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/left/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/right/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/corner/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/left/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
/obj/structure/bed/chair/sofa/right/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
/obj/structure/bed/chair/sofa/corner/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+22 -22
View File
@@ -123,34 +123,34 @@
buckle_movable = 1
/obj/structure/bed/chair/bay/chair/padded/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "carpet")
..(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, "leather")
..(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, "teal")
..(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, "black")
..(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, "green")
..(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, "purple")
..(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, "blue")
..(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, "beige")
..(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, "lime")
..(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, "yellow")
..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy
name = "comfy mounted chair"
@@ -159,34 +159,34 @@
base_icon = "bay_comfychair"
/obj/structure/bed/chair/bay/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "carpet")
..(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, "leather")
..(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, "teal")
..(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, "black")
..(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, "green")
..(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, "purple")
..(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, "blue")
..(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, "beige")
..(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, "lime")
..(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, "yellow")
..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain
name = "captain chair"
@@ -202,7 +202,7 @@
add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "blue")
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle
name = "shuttle seat"
@@ -211,7 +211,7 @@
icon_state = "shuttle_chair_preview"
buckle_movable = 0
var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = "blue"
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)
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+2 -2
View File
@@ -32,7 +32,7 @@ var/global/list/stool_cache = list() //haha stool
update_icon()
/obj/item/stool/padded/New(var/newloc, var/new_material)
..(newloc, "steel", "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/item/stool/update_icon()
// Prep icon.
@@ -125,7 +125,7 @@ var/global/list/stool_cache = list() //haha stool
return
var/padding_type //This is awful but it needs to be like this until tiles are given a material var.
if(istype(W,/obj/item/stack/tile/carpet))
padding_type = "carpet"
padding_type = MAT_CARPET
else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/M = W
if(M.material && (M.material.flags & MATERIAL_PADDING))
code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
+1 -1
View File
@@ -15,4 +15,4 @@
icon_state = "bar_stool_padded_preview" //set for the map
/obj/item/stool/baystool/padded/New(var/newloc, var/new_material)
..(newloc, "steel", "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)