From 1785cc92f5e2569c0fda10b059568c7909fefc68 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 2 May 2024 16:10:21 -0700 Subject: [PATCH] xeno repath --- code/game/objects/items/old_research.dm | 38 +++++++++---------- .../game/objects/items/tools/surgery_tools.dm | 10 ++--- maps/map_files/BigRed/BigRed.dmm | 12 +++--- maps/map_files/CORSAT/Corsat.dmm | 10 ++--- maps/map_files/DesertDam/Desert_Dam.dmm | 2 +- .../sprinkles/10.damtemple_intact.dmm | 4 +- maps/map_files/LV624/maintemple/1.intact.dmm | 4 +- maps/predship/huntership.dmm | 10 ++--- maps/predship/regular.dmm | 10 ++--- 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/code/game/objects/items/old_research.dm b/code/game/objects/items/old_research.dm index 7330baac5812..70e36fa10481 100644 --- a/code/game/objects/items/old_research.dm +++ b/code/game/objects/items/old_research.dm @@ -1,26 +1,26 @@ -/obj/item/XenoBio - name = "An unidentified Alien Organ" - desc = "Looking at it makes you want to vomit" +/obj/item/xeno_piece + name = "unknown organ" + desc = "Looking at it makes you want to vomit." icon = 'icons/obj/items/Marine_Research.dmi' icon_state = "biomass" black_market_value = 50 //For all of them for now, until we have specific organs/more techs -/obj/item/XenoBio/Resin - name = "Alien Resin" - desc = "A piece of alien Resin" +/obj/item/xeno_piece/resin + name = "alien resin" + desc = "A piece of alien resin." icon_state = "biomass" -/obj/item/XenoBio/Chitin - name = "Alien Chitin" - desc = "A chunk of alien Chitin" +/obj/item/xeno_piece/chitin + name = "alien chitin" + desc = "A chunk of alien chitin." icon_state = "chitin-chunk" -/obj/item/XenoBio/Blood - name = "Alien Blood" - desc = "A sample of alien Blood" +/obj/item/xeno_piece/blood + name = "vial of alien blood" + desc = "A sample of alien blood." icon_state = "blood-vial" @@ -32,19 +32,19 @@ // ======== ITEMS YOU CAN MAKE THAT ARE BADASS ======== // -/obj/item/XenoItem +/obj/item/xeno_item name = "Strange Item" desc = "Some sort of fucked up item from the Weyland-Yutani brand 3D Biometric Printer... Probably should make a bug report if you got this..." icon_state = "chitin-chunk" icon = 'icons/obj/items/Marine_Research.dmi' -/obj/item/XenoItem/ResinPaste +/obj/item/xeno_item/resin_paste name = "Resin Paste" desc = "This resin paste will fix a broken helmet. (Use by clicking the glue with the armor)." icon_state = "resin-glue" icon = 'icons/obj/items/Marine_Research.dmi' -/obj/item/XenoItem/ResinPaste/afterattack(obj/item/clothing/head/helmet/marine/A as obj, mob/user as mob) +/obj/item/xeno_item/resin_paste/afterattack(obj/item/clothing/head/helmet/marine/A as obj, mob/user as mob) if (!istype(A) || !istype(usr)) to_chat(usr, "Doesn't work that way") return @@ -58,13 +58,13 @@ ..() return -/obj/item/XenoItem/ChitinPlate +/obj/item/xeno_item/chitin_plate name = "Chitin Plate" desc = "A plate of Chitin Armor that can be attached to your Marine Armor to make it stronger, but will also slow you down. (Use by clicking the plate with the armor)." icon_state = "chitin-armor" icon = 'icons/obj/items/Marine_Research.dmi' -/obj/item/XenoItem/ChitinPlate/afterattack(obj/item/clothing/suit/storage/marine/A as obj, mob/user as mob) +/obj/item/xeno_item/chitin_plate/afterattack(obj/item/clothing/suit/storage/marine/A as obj, mob/user as mob) if (!istype(A) || !istype(usr)) to_chat(usr, "Doesn't work that way...") return @@ -87,14 +87,14 @@ return -/obj/item/XenoItem/AntiAcid +/obj/item/xeno_item/anti_acid name = "Anti-Acid Spray" desc = "A spray that makes whatever it's used on unacidable. Single use." icon_state = "anti-acid" icon = 'icons/obj/items/Marine_Research.dmi' -/obj/item/XenoItem/AntiAcid/afterattack(obj/A as obj, mob/user as mob, proximity) +/obj/item/xeno_item/anti_acid/afterattack(obj/A as obj, mob/user as mob, proximity) if (!isobj(A)) to_chat(usr, "Doesn't work that way...") return diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index 7d354d8d8c1c..4077f63a398e 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -531,8 +531,8 @@ t. optimisticdude to_chat(usr, "This is difficult, you probably shouldn't move") return to_chat(usr, "You've cut through the outer layers of Chitin") - new /obj/item/XenoBio/Chitin(T.loc) //This will be 1-3 Chitin eventually (depending on tier) - new /obj/item/XenoBio/Chitin(T.loc) //This will be 1-3 Chitin eventually (depending on tier) + new /obj/item/xeno_piece/chitin(T.loc) //This will be 1-3 Chitin eventually (depending on tier) + new /obj/item/xeno_piece/chitin(T.loc) //This will be 1-3 Chitin eventually (depending on tier) T.butchery_progress++ active = 0 if(1) @@ -541,7 +541,7 @@ t. optimisticdude to_chat(usr, "This is difficult, you probably shouldn't move.") return to_chat(usr, "You've cut into the chest cavity and retreived a sample of blood.") - new /obj/item/XenoBio/Blood(T.loc)//This will be a sample of blood eventually + new /obj/item/xeno_piece/blood(T.loc)//This will be a sample of blood eventually T.butchery_progress++ active = 0 if(2) @@ -551,7 +551,7 @@ t. optimisticdude return //to_chat(usr, "You've cut out an intact organ.") to_chat(usr, "You've cut out some Biomass...") - new /obj/item/XenoBio/Resin(T.loc)//This will be an organ eventually, based on the caste. + new /obj/item/xeno_piece/resin(T.loc)//This will be an organ eventually, based on the caste. T.butchery_progress++ active = 0 if(3) @@ -561,6 +561,6 @@ t. optimisticdude return to_chat(usr, "You scrape out the remaining biomass.") active = 0 - new /obj/item/XenoBio/Resin(T.loc) + new /obj/item/xeno_piece/resin(T.loc) new /obj/effect/decal/remains/xeno(T.loc) qdel(T) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index b605e7115c10..b6184df4ad5e 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -4912,7 +4912,7 @@ /area/bigredv2/caves/lambda/xenobiology) "aoJ" = ( /obj/structure/surface/table/reinforced, -/obj/item/XenoBio/Resin, +/obj/item/xeno_piece/resin, /turf/open/floor{ dir = 4; icon_state = "whitepurple" @@ -14076,8 +14076,8 @@ /area/bigredv2/caves/eta/research) "aPg" = ( /obj/structure/surface/table, -/obj/item/XenoBio/Blood, -/obj/item/XenoBio/Blood, +/obj/item/xeno_piece/blood, +/obj/item/xeno_piece/blood, /obj/item/paper, /turf/open/floor{ icon_state = "darkredcorners2" @@ -25570,8 +25570,8 @@ /area/bigredv2/caves/eta/xenobiology) "bCg" = ( /obj/structure/surface/table, -/obj/item/XenoBio/Blood, -/obj/item/XenoBio/Blood, +/obj/item/xeno_piece/blood, +/obj/item/xeno_piece/blood, /obj/item/tool/pen, /turf/open/floor{ dir = 4; @@ -38359,7 +38359,7 @@ name = "trophy board"; pixel_y = 30 }, -/obj/item/XenoBio/Chitin{ +/obj/item/xeno_piece/chitin{ anchored = 1; pixel_y = 27 }, diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 9c09a95e9f94..cce4a5a579e7 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -27817,7 +27817,7 @@ name = "Secure Racks"; req_access_txt = "103" }, -/obj/item/XenoItem/AntiAcid, +/obj/item/xeno_item/anti_acid, /turf/open/floor/corsat{ icon_state = "purplewhite" }, @@ -27846,7 +27846,7 @@ name = "Secure Racks"; req_access_txt = "103" }, -/obj/item/XenoItem/ResinPaste, +/obj/item/xeno_item/resin_paste, /turf/open/floor/corsat{ icon_state = "purplewhite" }, @@ -27885,7 +27885,7 @@ /area/corsat/omega/complex) "bAy" = ( /obj/structure/surface/rack, -/obj/item/XenoBio/Resin, +/obj/item/xeno_piece/resin, /obj/structure/window/reinforced/toughened{ dir = 8 }, @@ -28363,7 +28363,7 @@ name = "Secure Racks"; req_access_txt = "103" }, -/obj/item/XenoBio/Blood, +/obj/item/xeno_piece/blood, /turf/open/floor/corsat{ dir = 1; icon_state = "purplewhite" @@ -28377,7 +28377,7 @@ /area/corsat/omega/complex) "bBJ" = ( /obj/structure/surface/rack, -/obj/item/XenoBio/Chitin, +/obj/item/xeno_piece/chitin, /obj/structure/window/reinforced/toughened{ dir = 8 }, diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index a86fb326152d..014cb2ce41dd 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -3589,7 +3589,7 @@ "akX" = ( /obj/structure/surface/table/reinforced, /obj/item/tool/pen, -/obj/item/XenoBio/Blood, +/obj/item/xeno_piece/blood, /turf/open/floor/prison{ dir = 8; icon_state = "darkpurple2" diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm index d0ebbc5039d5..8a72a4060f43 100644 --- a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm +++ b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm @@ -313,10 +313,10 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/XenoItem/AntiAcid{ +/obj/item/xeno_item/anti_acid{ pixel_x = -6 }, -/obj/item/XenoItem/AntiAcid{ +/obj/item/xeno_item/anti_acid{ pixel_x = 4 }, /turf/open/floor/strata{ diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index 8f7c741d80c6..e45de3b1907b 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -1468,10 +1468,10 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/XenoItem/AntiAcid{ +/obj/item/xeno_item/anti_acid{ pixel_x = -6 }, -/obj/item/XenoItem/AntiAcid{ +/obj/item/xeno_item/anti_acid{ pixel_x = 4 }, /obj/effect/landmark/objective_landmark/close, diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 7c5d633286f0..5d5470668d57 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -835,8 +835,8 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/XenoItem/ChitinPlate, -/obj/item/XenoItem/ChitinPlate, +/obj/item/xeno_item/chitin_plate, +/obj/item/xeno_item/chitin_plate, /obj/item/stack/sheet/xenochitin, /obj/item/stack/sheet/xenochitin, /turf/open/floor/corsat{ @@ -1695,9 +1695,9 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/XenoItem/AntiAcid, -/obj/item/XenoItem/AntiAcid, -/obj/item/XenoItem/AntiAcid, +/obj/item/xeno_item/anti_acid, +/obj/item/xeno_item/anti_acid, +/obj/item/xeno_item/anti_acid, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" diff --git a/maps/predship/regular.dmm b/maps/predship/regular.dmm index 895e8ae84c91..ede105c4c2f4 100644 --- a/maps/predship/regular.dmm +++ b/maps/predship/regular.dmm @@ -1177,8 +1177,8 @@ /area/yautja) "dp" = ( /obj/structure/surface/table/reinforced, -/obj/item/XenoBio/Blood, -/obj/item/XenoBio/Blood, +/obj/item/xeno_piece/blood, +/obj/item/xeno_piece/blood, /turf/open/floor/holofloor{ dir = 2; icon_state = "cult" @@ -1186,7 +1186,7 @@ /area/yautja) "dq" = ( /obj/structure/surface/table/reinforced, -/obj/item/XenoItem, +/obj/item/xeno_item, /turf/open/floor/holofloor{ dir = 2; icon_state = "cult" @@ -1202,8 +1202,8 @@ /area/yautja) "dz" = ( /obj/structure/surface/table/reinforced, -/obj/item/XenoBio/Resin, -/obj/item/XenoBio/Resin, +/obj/item/xeno_piece/resin, +/obj/item/xeno_piece/resin, /turf/open/floor/holofloor{ dir = 2; icon_state = "cult"