Skip to content

Commit

Permalink
I HATE MERGE CONFLICTS!!!
Browse files Browse the repository at this point in the history
  • Loading branch information
@goober3
goober3 committed Jun 15, 2024
1 parent b36e204 commit 7f266db
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 20 deletions.
28 changes: 14 additions & 14 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
/obj/effect/turf_decal/spline/fancy/opaque/white{
dir = 5
},
/mob/living/simple_animal/hostile/frontier/ranged/internals/neutered,
/mob/living/simple_animal/hostile/human/frontier/ranged/internals/neutered,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/saloon)
"bd" = (
Expand Down Expand Up @@ -358,7 +358,7 @@
/obj/structure/cable/yellow{
icon_state = "4-9"
},
/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"dJ" = (
Expand Down Expand Up @@ -1366,7 +1366,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/west,
/mob/living/simple_animal/hostile/frontier,
/mob/living/simple_animal/hostile/human/frontier,
/turf/open/floor/pod,
/area/ruin/rockplanet/distillery/crew)
"pM" = (
Expand Down Expand Up @@ -2539,7 +2539,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/mob/living/simple_animal/hostile/frontier/internals,
/mob/living/simple_animal/hostile/human/frontier/internals,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery)
"Cz" = (
Expand Down Expand Up @@ -2721,7 +2721,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/mob/living/simple_animal/hostile/frontier/internals,
/mob/living/simple_animal/hostile/human/frontier/internals,
/turf/open/floor/wood/rockplanet,
/area/ruin/rockplanet/distillery/saloon)
"EI" = (
Expand Down Expand Up @@ -2942,7 +2942,7 @@
id = "pod_fore"
},
/obj/effect/decal/cleanable/oil,
/mob/living/simple_animal/hostile/frontier/ranged/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/internals,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/shuttle)
"Hg" = (
Expand Down Expand Up @@ -3488,7 +3488,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
"NE" = (
Expand Down Expand Up @@ -3562,8 +3562,8 @@
/area/ruin/rockplanet/distillery/crew)
"Od" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/frontier/ranged/neutered,
/obj/structure/chair/sofa/brown/old/corner/directional/south,
/mob/living/simple_animal/hostile/human/frontier/ranged/internals/neutered,
/turf/open/floor/wood,
/area/ruin/rockplanet/distillery/crew)
"Oe" = (
Expand Down Expand Up @@ -3698,7 +3698,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/internals/neutered,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals/neutered,
/turf/open/floor/pod/rockplanet,
/area/ruin/rockplanet/distillery/shuttle)
"PV" = (
Expand All @@ -3724,7 +3724,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"Qp" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/frontier/ranged/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/internals,
/turf/open/floor/plating/rust/rockplanet/lit,
/area/ruin/rockplanet/distillery)
"Qr" = (
Expand Down Expand Up @@ -3976,7 +3976,7 @@
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/office)
"Ta" = (
/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"Td" = (
Expand Down Expand Up @@ -4069,7 +4069,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/west,
/mob/living/simple_animal/hostile/frontier/internals,
/mob/living/simple_animal/hostile/human/frontier/internals,
/turf/open/floor/wood/rockplanet,
/area/ruin/rockplanet/distillery/saloon)
"Uo" = (
Expand Down Expand Up @@ -4319,7 +4319,7 @@
/obj/structure/chair/office{
dir = 8
},
/mob/living/simple_animal/hostile/frontier/ranged/mosin/internals/neutered,
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/internals/neutered,
/turf/open/floor/pod/rockplanet,
/area/ruin/rockplanet/distillery)
"Wm" = (
Expand Down Expand Up @@ -4402,7 +4402,7 @@
specialfunctions = 4;
id = "frontier_armory"
},
/mob/living/simple_animal/hostile/frontier/ranged/officer/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals,
/turf/open/floor/wood,
/area/ruin/rockplanet/distillery/office)
"XD" = (
Expand Down
124 changes: 118 additions & 6 deletions code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,27 @@
name = "Frontiersman"
desc = "A frontiersman! A terrorist that would probably kill everyone without mercy."
icon_state = "frontiersmanmelee"
icon = 'icons/mob/simple_frontiersman.dmi'
icon_living = "frontiersmanmelee"
icon_dead = "frontiersmanmelee_dead"
speak_chance = 0
melee_damage_lower = 15
melee_damage_upper = 15
loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
/obj/item/kitchen/knife)
/obj/item/kitchen/knife/combat/survival)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
faction = list(FACTION_ANTAG_FRONTIERSMEN)
footstep_type = FOOTSTEP_MOB_SHOE

/mob/living/simple_animal/hostile/human/frontier/internals
icon_state = "frontiersmanmelee_mask"
icon_living = "frontiersmanmelee_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0


/mob/living/simple_animal/hostile/human/frontier/ranged
icon_state = "frontiersmanranged"
Expand All @@ -23,6 +35,21 @@
projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
casingtype = /obj/item/ammo_casing/a357

/mob/living/simple_animal/hostile/human/frontier/ranged/internals
icon_state = "frontiersmanranged_mask"
icon_living = "frontiersmanranged_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/gun/ballistic/revolver,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0

/mob/living/simple_animal/hostile/human/frontier/ranged/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)

Expand All @@ -34,6 +61,21 @@
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'

/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/internals
icon_state = "frontiersmanrangedrifle_mask"
icon_living = "frontiersmanrangedrifle_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/gun/ballistic/rifle/illestren,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0

/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)

Expand All @@ -47,6 +89,21 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/shotgun/brimstone)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals
icon_state = "frontiersmanrangedelite_mask"
icon_living = "frontiersmanrangedelite_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)

Expand All @@ -60,6 +117,21 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/skm)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals
icon_state = "frontiersmanrangedak47_mask"
icon_living = "frontiersmanrangedak47_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/skm,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/neutured
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)

Expand All @@ -72,6 +144,21 @@
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals
icon_state = "frontiersmanrangedmosin_mask"
icon_living = "frontiersmanrangedmosin_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/rifle/illestren,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)

Expand All @@ -87,6 +174,21 @@
projectiletype = /obj/projectile/beam/weak/penetrator
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals
icon_state = "frontiersmanrangedminigun_mask"
icon_living = "frontiersmanrangedminigun_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0


/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless)

Expand All @@ -101,10 +203,20 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
/obj/item/gun/ballistic/automatic/pistol/APS)

/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals
icon_state = "frontiersmanofficer_mask"
icon_living = "frontiersmanofficer_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
/obj/item/gun/ballistic/automatic/pistol/APS,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
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)
minbodytemp = 0

/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)

/mob/living/simple_animal/hostile/human/frontier/ranged/officer/neutured
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer)

/mob/living/simple_animal/hostile/human/frontier/ranged/officer/Aggro()
..()
summon_backup(15)
say(pick("Help!!", "They're right here!!", "Don't let me die!!"))
Binary file modified icons/obj/storage.dmi
View file
Binary file not shown.

0 comments on commit 7f266db

Please sign in to comment.