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

Hostile humans #2972

Merged
merged 24 commits into from
Jun 2, 2024
Merged

Hostile humans #2972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b45ab00
sorting human files
FalloutFalcon May 8, 2024
812a6b6
Merge remote-tracking branch 'Shiptest/master' into hostile-humans
FalloutFalcon May 8, 2024
aa0cf93
removes old code goofballs
FalloutFalcon May 8, 2024
9a1b192
baseline human
FalloutFalcon May 9, 2024
8cd2b84
no evil wizards
FalloutFalcon May 9, 2024
217586a
regex
FalloutFalcon May 9, 2024
52f007d
regex
FalloutFalcon May 9, 2024
9649313
var name
FalloutFalcon May 9, 2024
e55f6be
Merge branch 'master' into hostile-humans
FalloutFalcon May 9, 2024
c5d255f
removes paper mob stuff
FalloutFalcon May 14, 2024
6686dcb
stuff
FalloutFalcon May 15, 2024
a8cab83
small var stuff
FalloutFalcon May 15, 2024
9d20bea
tiny
FalloutFalcon May 15, 2024
d75dfe1
how did that happen
FalloutFalcon May 15, 2024
8bce3a1
Merge branch 'master' into hostile-humans
FalloutFalcon May 15, 2024
887e42b
script name
FalloutFalcon May 15, 2024
1593f4e
script. name.
FalloutFalcon May 15, 2024
5efb23b
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon May 24, 2024
1c273fa
oop
FalloutFalcon May 24, 2024
ca6185e
converts zombies to humans
FalloutFalcon May 24, 2024
3200f6a
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon May 27, 2024
0b122eb
fix extra corpse
FalloutFalcon May 28, 2024
614fdf1
Merge branch 'master' into hostile-humans
FalloutFalcon May 28, 2024
03d99b7
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon May 31, 2024
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
14 changes: 7 additions & 7 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Bg" = (
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/plastic,
Expand Down Expand Up @@ -827,7 +827,7 @@
/area/ruin/beach)
"Gt" = (
/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
/mob/living/simple_animal/hostile/cat_butcherer{
/mob/living/simple_animal/hostile/human/cat_butcherer{
atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0);
desc = "A profession carp butcher, gone mad due to carptoxin exposure. There seems to be something in their pocket...";
faction = list("beach","pirate");
Expand All @@ -853,7 +853,7 @@
"GP" = (
/obj/structure/chair/sofa/brown/right/directional/south,
/obj/effect/decal/cleanable/cobweb,
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/carpet,
Expand Down Expand Up @@ -1045,7 +1045,7 @@
/obj/structure/chair/plastic{
dir = 8
},
/mob/living/simple_animal/hostile/pirate/ranged{
/mob/living/simple_animal/hostile/human/pirate/ranged{
faction = list("beach","pirate")
},
/turf/open/floor/wood/ebony,
Expand Down Expand Up @@ -1135,7 +1135,7 @@
/area/ruin/beach)
"Rh" = (
/obj/structure/chair/sofa/brown/corner/directional/south,
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/carpet,
Expand Down Expand Up @@ -1250,7 +1250,7 @@
pixel_x = 4;
layer = 2.9
},
/mob/living/simple_animal/hostile/pirate/ranged{
/mob/living/simple_animal/hostile/human/pirate/ranged{
faction = list("beach","pirate")
},
/turf/open/floor/wood/ebony,
Expand Down Expand Up @@ -1333,7 +1333,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"ZJ" = (
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/wood,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"jE" = (
/mob/living/simple_animal/hostile/pirate/ranged{
/mob/living/simple_animal/hostile/human/pirate/ranged{
environment_smash = 0;
faction = list("pirate","mining")
},
Expand Down Expand Up @@ -522,7 +522,7 @@
/obj/structure/cable{
icon_state = "1-4"
},
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
environment_smash = 0;
faction = list("pirate","mining")
},
Expand Down Expand Up @@ -1508,7 +1508,7 @@
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/cave/explored)
"Vc" = (
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
environment_smash = 0;
faction = list("pirate","mining")
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/pirate/ranged/space,
/mob/living/simple_animal/hostile/human/pirate/ranged/space,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
"oR" = (
Expand Down Expand Up @@ -970,12 +970,12 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/pirate/melee,
/mob/living/simple_animal/hostile/human/pirate/melee,
/turf/open/floor/plating/dirt/jungle/lit,
/area/ruin/beach/treasure_cove)
"EU" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/pirate/melee,
/mob/living/simple_animal/hostile/human/pirate/melee,
/turf/open/floor/plating/dirt/jungle/lit,
/area/ruin/beach/treasure_cove)
"Gm" = (
Expand Down Expand Up @@ -1301,7 +1301,7 @@
/obj/structure/chair/wood{
dir = 8
},
/mob/living/simple_animal/hostile/pirate/ranged,
/mob/living/simple_animal/hostile/human/pirate/ranged,
/turf/open/floor/carpet/red,
/area/ruin/beach/treasure_cove)
"SX" = (
Expand Down
26 changes: 13 additions & 13 deletions _maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 9
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Benny Bleighch"
Expand Down Expand Up @@ -566,7 +566,7 @@
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectrooms)
"or" = (
/mob/living/simple_animal/hostile/nanotrasen/elite{
/mob/living/simple_animal/hostile/human/nanotrasen/elite{
desc = "A former major player for Nanotrasen militaristic needs. He doesn't seem like someone who'd want to talk over tea.";
faction = list("DeserterNT");
name = "Sam the Sharp"
Expand Down Expand Up @@ -780,7 +780,7 @@
/area/ruin/unpowered/corprejectrooms)
"tb" = (
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Rebecca Slouch"
Expand Down Expand Up @@ -1064,7 +1064,7 @@
/obj/structure/cable/blue{
icon_state = "4-9"
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Gloria the Glorious"
Expand Down Expand Up @@ -1106,7 +1106,7 @@
/obj/structure/chair{
dir = 8
},
/mob/living/simple_animal/hostile/nanotrasen/screaming{
/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Jimmy Firecracker"
Expand Down Expand Up @@ -1879,7 +1879,7 @@
/obj/structure/cable/blue{
icon_state = "4-9"
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Todd Clorox"
Expand All @@ -1902,7 +1902,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/mob/living/simple_animal/hostile/nanotrasen/elite{
/mob/living/simple_animal/hostile/human/nanotrasen/elite{
desc = "A former major player for Nanotrasen militaristic needs. He doesn't seem like someone who'd want to talk over tea.";
faction = list("DeserterNT");
name = "Max the Maniac"
Expand All @@ -1927,7 +1927,7 @@
/area/ruin/unpowered/corprejectrooms)
"Rp" = (
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Gordon Lary"
Expand Down Expand Up @@ -2003,7 +2003,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 4
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Gary Larson"
Expand Down Expand Up @@ -2086,15 +2086,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Nancy Drew"
},
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/unpowered/corprejectrooms)
"Us" = (
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Larry Liessahl"
Expand Down Expand Up @@ -2231,7 +2231,7 @@
/obj/structure/cable/blue{
icon_state = "0-4"
},
/mob/living/simple_animal/hostile/nanotrasen/screaming{
/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Wendy Wallaby"
Expand Down Expand Up @@ -2286,7 +2286,7 @@
/obj/structure/cable/blue{
icon_state = "4-5"
},
/mob/living/simple_animal/hostile/nanotrasen/screaming{
/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Wetzel the Pretzel"
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@
/area/ruin/powered)
"Wp" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space,
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
/turf/open/floor/plasteel/freezer,
/area/ruin/powered)
"Ws" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
/area/ruin/powered)
"PQ" = (
/obj/effect/decal/cleanable/blood/splatter,
/mob/living/simple_animal/hostile/frontier/ranged/trooper,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down
Loading
Loading