Skip to content

Commit

Permalink
xeno repath
Browse files Browse the repository at this point in the history
  • Loading branch information
Zonespace27 committed May 2, 2024
1 parent 499d157 commit 1785cc9
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 50 deletions.
38 changes: 19 additions & 19 deletions code/game/objects/items/old_research.dm
Original file line number Diff line number Diff line change
@@ -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"


Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/tools/surgery_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
12 changes: 6 additions & 6 deletions maps/map_files/BigRed/BigRed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -38359,7 +38359,7 @@
name = "trophy board";
pixel_y = 30
},
/obj/item/XenoBio/Chitin{
/obj/item/xeno_piece/chitin{
anchored = 1;
pixel_y = 27
},
Expand Down
10 changes: 5 additions & 5 deletions maps/map_files/CORSAT/Corsat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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"
Expand All @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/DesertDam/Desert_Dam.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/LV624/maintemple/1.intact.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions maps/predship/huntership.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions maps/predship/regular.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1177,16 +1177,16 @@
/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"
},
/area/yautja)
"dq" = (
/obj/structure/surface/table/reinforced,
/obj/item/XenoItem,
/obj/item/xeno_item,
/turf/open/floor/holofloor{
dir = 2;
icon_state = "cult"
Expand All @@ -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"
Expand Down

0 comments on commit 1785cc9

Please sign in to comment.