Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makes the predator computers not a moneybag subtype #4084

Merged
merged 2 commits into from
Aug 3, 2023
Merged

Makes the predator computers not a moneybag subtype #4084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a3cb8
corrects a pred prop
johndoe2013 Aug 2, 2023
0898561
Merge branch 'master' into pred-money
Zonespace27 Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/game/objects/structures/props.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,8 +1153,16 @@
icon_state = "rope"
density = FALSE

/obj/structure/prop/pred_flight
name = "hunter flight console"
desc = "A console designed by the Hunters to assist in flight pathing and navigation."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "overwatch"
density = TRUE

/obj/structure/prop/invuln/joey
name = "Workin' Joey"
desc = "A defunct Seegson-brand Working Joe lifted from deep storage by a crew of marines after the last shore leave. Attempts have been made to modify the janitorial synthetic to serve as a crude bartender, but with little success."
icon = 'icons/obj/structures/props/props.dmi'
icon_state = "joey"

36 changes: 15 additions & 21 deletions maps/predship/huntership.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,9 +674,9 @@
color = "#6b675e"
},
/obj/item/weapon/claymore/mercsword/machete/arnold{
anchored = 1;
desc = "Won by an Elder during their youthful hunting days. None are allowed to touch it.";
name = "\improper Dutch's Machete";
anchored = 1
name = "\improper Dutch's Machete"
},
/turf/open/floor/corsat{
dir = 1;
Expand Down Expand Up @@ -1789,9 +1789,9 @@
/area/yautja)
"gr" = (
/obj/structure/closet/crate/secure{
req_one_access_txt = "252";
color = "#6b675e";
name = "Secure Yautja crate"
name = "Secure Yautja crate";
req_one_access_txt = "252"
},
/obj/item/explosive/grenade/spawnergrenade/hellhound,
/obj/item/explosive/grenade/spawnergrenade/hellhound,
Expand All @@ -1806,9 +1806,9 @@
/obj/structure/machinery/door_control{
id = "Yautja Armory";
name = "Armory Shutters";
needs_power = 0;
pixel_x = 24;
req_one_access_txt = "252";
needs_power = 0
req_one_access_txt = "252"
},
/turf/open/floor/corsat{
dir = 1;
Expand Down Expand Up @@ -2424,9 +2424,9 @@
/area/yautja)
"Bg" = (
/obj/structure/closet/crate/secure{
req_one_access_txt = "252";
color = "#6b675e";
name = "Secure Yautja crate"
name = "Secure Yautja crate";
req_one_access_txt = "252"
},
/obj/item/weapon/yautja/combistick,
/obj/item/weapon/yautja/combistick{
Expand Down Expand Up @@ -2686,14 +2686,14 @@
layer = 2.79
},
/obj/item/stack/medical/advanced/ointment/predator{
pixel_x = 6;
desc = "A poultice made of cold, blue petals that is rubbed on burns. Not to be removed from the ship.";
name = "arena soothing herbs"
name = "arena soothing herbs";
pixel_x = 6
},
/obj/item/stack/medical/advanced/bruise_pack/predator{
pixel_x = -6;
desc = "A poultice made of soft leaves that is rubbed on bruises. Not to be removed from the ship.";
name = "arena mending herbs"
name = "arena mending herbs";
pixel_x = -6
},
/turf/open/shuttle/predship,
/area/yautja)
Expand Down Expand Up @@ -2721,9 +2721,9 @@
"HD" = (
/obj/structure/surface/rack{
color = "#6b675e";
density = 0;
layer = 2.79;
pixel_y = 24;
density = 0
pixel_y = 24
},
/obj/item/weapon/gun/energy/yautja/plasmarifle{
pixel_y = -8
Expand Down Expand Up @@ -2924,13 +2924,7 @@
},
/area/yautja)
"LX" = (
/obj/item/moneybag{
anchored = 1;
desc = "A console designed by the Hunters to assist in flight pathing and navigation.";
icon = 'icons/obj/structures/machinery/computer.dmi';
icon_state = "overwatch";
name = "Hunter Flight Console"
},
/obj/structure/prop/pred_flight,
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
Expand Down