Skip to content

Commit

Permalink
kills the statues
Browse files Browse the repository at this point in the history
  • Loading branch information
Sadhorizon committed Oct 12, 2024
1 parent 901bfc9 commit 7507a47
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 197 deletions.
6 changes: 1 addition & 5 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1698,10 +1698,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown/shop)
"ww" = (
/obj/structure/statue/sandstone/assistant,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"wF" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
Expand Down Expand Up @@ -7687,7 +7683,7 @@ sa
sa
Ud
sa
ww
sa
sa
Ud
sa
Expand Down
4 changes: 3 additions & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@
/area/overmap_encounter/planetoid/jungle/explored)
"bU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/statue/sandstone/assistant,
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/obj/machinery/light_switch{
pixel_y = 21;
pixel_x = -10
Expand Down
2 changes: 0 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2024,7 +2024,6 @@
/turf/open/floor/engine/hull/interior,
/area/overmap_encounter/planetoid/lava/explored)
"Hl" = (
/obj/structure/statue/sandstone/assistant,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
Expand Down Expand Up @@ -2380,7 +2379,6 @@
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_starwalker)
"Mk" = (
/obj/structure/statue/sandstone/assistant,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
Expand Down
8 changes: 2 additions & 6 deletions _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8222,10 +8222,6 @@
},
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Wi" = (
/obj/structure/statue/sandstone/assistant,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"Wj" = (
/obj/effect/decal/cleanable/food/salt,
/obj/effect/turf_decal/siding/wideplating/light,
Expand Down Expand Up @@ -10035,7 +10031,7 @@ rc
bb
yI
yI
Wi
yI
CP
nK
jY
Expand Down Expand Up @@ -10115,7 +10111,7 @@ rW
bb
yI
yI
Wi
yI
CP
nK
jY
Expand Down
183 changes: 0 additions & 183 deletions code/game/objects/structures/statues.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
desc = "This is a grand statue of a Nuclear Explosive. It has a sickening green colour."
icon_state = "nuke"

/obj/structure/statue/uranium/eng
name = "Statue of an engineer"
desc = "This statue has a sickening green colour."
icon_state = "eng"

/obj/structure/statue/uranium/attackby(obj/item/W, mob/user, params)
radiate()
return ..()
Expand All @@ -93,181 +88,13 @@
return
return

////////////////////////////plasma///////////////////////////////////////////////////////////////////////

/obj/structure/statue/plasma
max_integrity = 200
material_drop_type = /obj/item/stack/sheet/mineral/plasma
impressiveness = 20
desc = "This statue is suitably made from plasma."

/obj/structure/statue/plasma/scientist
name = "statue of a scientist"
icon_state = "sci"

/obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
PlasmaBurn(exposed_temperature)


/obj/structure/statue/plasma/bullet_act(obj/projectile/Proj)
var/burn = FALSE
if(!(Proj.nodamage) && Proj.damage_type == BURN && !QDELETED(src))
burn = TRUE
if(burn)
var/turf/T = get_turf(src)
if(Proj.firer)
message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(Proj.firer)] in [ADMIN_VERBOSEJMP(T)]")
log_game("Plasma statue ignited by [key_name(Proj.firer)] in [AREACOORD(T)]")
else
message_admins("Plasma statue ignited by [Proj]. No known firer, in [ADMIN_VERBOSEJMP(T)]")
log_game("Plasma statue ignited by [Proj] in [AREACOORD(T)]. No known firer.")
PlasmaBurn(2500)
. = ..()

/obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params)
if(W.get_temperature() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite
var/turf/T = get_turf(src)
message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
log_game("Plasma statue ignited by [key_name(user)] in [AREACOORD(T)]")
ignite(W.get_temperature())
else
return ..()

/obj/structure/statue/plasma/proc/PlasmaBurn(exposed_temperature)
if(QDELETED(src))
return
atmos_spawn_air("plasma=[oreAmount*10];TEMP=[exposed_temperature]")
deconstruct(FALSE)

/obj/structure/statue/plasma/proc/ignite(exposed_temperature)
if(exposed_temperature > 300)
PlasmaBurn(exposed_temperature)

//////////////////////gold///////////////////////////////////////

/obj/structure/statue/gold
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/gold
impressiveness = 25
desc = "This is a highly valuable statue made from gold."

/obj/structure/statue/gold/hos
name = "statue of the head of security"
icon_state = "hos"

/obj/structure/statue/gold/head_of_personnel
name = "statue of the head of personnel"
icon_state = "hop"

/obj/structure/statue/gold/cmo
name = "statue of the chief medical officer"
icon_state = "cmo"

/obj/structure/statue/gold/ce
name = "statue of the chief engineer"
icon_state = "ce"

/obj/structure/statue/gold/rd
name = "statue of the research director"
icon_state = "rd"

//////////////////////////silver///////////////////////////////////////

/obj/structure/statue/silver
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/silver
impressiveness = 25
desc = "This is a valuable statue made from silver."

/obj/structure/statue/silver/md
name = "statue of a medical officer"
icon_state = "md"

/obj/structure/statue/silver/janitor
name = "statue of a janitor"
icon_state = "jani"

/obj/structure/statue/silver/sec
name = "statue of a security officer"
icon_state = "sec"

/obj/structure/statue/silver/secborg
name = "statue of a security cyborg"
icon_state = "secborg"

/obj/structure/statue/silver/medborg
name = "statue of a medical cyborg"
icon_state = "medborg"

/////////////////////////diamond/////////////////////////////////////////

/obj/structure/statue/diamond
max_integrity = 1000
material_drop_type = /obj/item/stack/sheet/mineral/diamond
impressiveness = 50
desc = "This is a very expensive diamond statue."

/obj/structure/statue/diamond/captain
name = "statue of THE captain."
icon_state = "cap"

/obj/structure/statue/diamond/ai1
name = "statue of the AI hologram."
icon_state = "ai1"

/obj/structure/statue/diamond/ai2
name = "statue of the AI core."
icon_state = "ai2"

////////////////////////bananium///////////////////////////////////////

/obj/structure/statue/bananium
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/hidden/hellstone
impressiveness = 50
desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
var/spam_flag = 0

/obj/structure/statue/bananium/clown
name = "statue of a clown"
icon_state = "clown"

/obj/structure/statue/bananium/Bumped(atom/movable/AM)
honk()
..()

/obj/structure/statue/bananium/attackby(obj/item/W, mob/user, params)
honk()
return ..()

/obj/structure/statue/bananium/attack_hand(mob/user)
honk()
. = ..()

/obj/structure/statue/bananium/attack_paw(mob/user)
honk()
..()

/obj/structure/statue/bananium/proc/honk()
if(!spam_flag)
spam_flag = TRUE
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, TRUE)
addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS)

/////////////////////sandstone/////////////////////////////////////////

/obj/structure/statue/sandstone
max_integrity = 50
material_drop_type = /obj/item/stack/sheet/mineral/sandstone
impressiveness = 15

/obj/structure/statue/sandstone/assistant
name = "statue of an assistant"
desc = "A cheap statue of sandstone for a greyshirt."
icon_state = "assist"


/obj/structure/statue/sandstone/venus //call me when we add marble i guess
name = "statue of a pure maiden"
desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though."
Expand All @@ -290,16 +117,6 @@
desc = "Looks like that weird kid with the tiger plushie has been round here again."
icon_state = "snowlegion"

///////////////////////////////bronze///////////////////////////////////

/obj/structure/statue/bronze
material_drop_type = /obj/item/stack/tile/bronze

/obj/structure/statue/bronze/marx
name = "\improper Karl Marx bust"
desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the sector."
icon_state = "marx"

/// bone
/obj/structure/statue/bone
anchored = TRUE
Expand Down
Binary file modified icons/obj/statue.dmi
Binary file not shown.

0 comments on commit 7507a47

Please sign in to comment.