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.

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

Frontiersman Distillery Ruin #2907

Merged
merged 29 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5526661
fucj!!
goober3 Apr 15, 2024
35e2fa0
adds armory w/ ammo
goober3 Apr 16, 2024
0ee7c73
oops i forgot to edit the map catalogue tags
goober3 Apr 16, 2024
fd88289
Merge branch 'master' into ruin-distillery
goober3 Apr 16, 2024
8234a65
epic layer fail
goober3 Apr 16, 2024
0c381f8
Merge branch 'ruin-distillery' of https://github.com/goober3/hi-githu…
goober3 Apr 16, 2024
6e78c71
moonshine no longer requires srm distillers
goober3 Apr 16, 2024
b3523b9
fixes mines & adds some fixers courtesy of fallcon
goober3 Apr 16, 2024
d7f51e5
yet another layer fail. we lose these.
goober3 Apr 16, 2024
eeca5ac
i'm so tortured
goober3 Apr 16, 2024
4de3e82
this user forgot to delete the docking port
goober3 Apr 16, 2024
cbae2cf
Merge branch 'master' into ruin-distillery
goober3 Apr 16, 2024
4bbf845
Merge remote-tracking branch 'upstream/master' into ruin-distillery
goober3 Apr 20, 2024
0ac3c84
your tweaks, sire.
goober3 Apr 20, 2024
e25a945
Merge remote-tracking branch 'upstream/master' into ruin-distillery
goober3 Apr 22, 2024
073c3d7
fixa the merge conflict
goober3 Apr 22, 2024
fd91225
addresses reviews
goober3 Jun 15, 2024
b36e204
Merge remote-tracking branch 'upstream/master' into ruin-distillery
goober3 Jun 15, 2024
7f266db
I HATE MERGE CONFLICTS!!!
goober3 Jun 15, 2024
197b020
i continue hating merge conflicts
goober3 Jun 15, 2024
32b7211
fixes some layering fails
goober3 Jun 16, 2024
a8b4e41
Merge remote-tracking branch 'upstream/master' into ruin-distillery
goober3 Jun 22, 2024
2879c87
Revert "Merge remote-tracking branch 'upstream/master' into ruin-dist…
goober3 Jun 22, 2024
4a6235d
Reapply "Merge remote-tracking branch 'upstream/master' into ruin-dis…
goober3 Jun 22, 2024
80dae07
i hate merge conflicts
goober3 Jun 22, 2024
8daea56
speedloader fix
goober3 Jun 22, 2024
e0fc61f
Update _maps/map_catalogue.txt
goober3 Jun 22, 2024
c03a1d0
Update _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
goober3 Jul 20, 2024
3057710
Merge branch 'master' into ruin-distillery
goober3 Jul 20, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into ruin-distillery
  • Loading branch information
goober3 committed Jun 15, 2024
commit b36e204e5ff4d65fe089fadb766eb3ed7630d263
4 changes: 4 additions & 0 deletions _maps/map_catalogue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 30)(y = 20)(z = 1)
Tags = "Medium combat Challenge", "Medium Loot", "Inhospitable"

File Name = "_maps\RandomRuins\RockRuins\rockplanet_shippingdock.dmm"
Size = (x = 85)(y = 73)(z = 1)
Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Shelter"

File Name = "_maps\RandomRuins\RockRuins\rockplanet_nomadcrash.dmm"
Size = (x = 58)(y = 48)(z = 1)
Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Hospitable"
Expand Down
7 changes: 6 additions & 1 deletion code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -405,4 +405,9 @@
/datum/map_template/shuttle/subshuttles/tanto
file_name = "independent_tanto"
name = "Tanto-class Drop Pod"
prefix = "ISV"
prefix = "SV"

/datum/map_template/shuttle/subshuttles/brawler
file_name = "frontiersmen_brawler"
name = "Brawler-class Dropship"
prefix = "SV"
141 changes: 14 additions & 127 deletions code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
/mob/living/simple_animal/hostile/human/frontier
name = "Frontiersman"
desc = "A frontiersman! A terrorist that would probably kill everyone without mercy."
icon = 'icons/mob/simple_frontiersman.dmi'
icon_state = "frontiersmanmelee"
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/combat/survival)
/obj/item/kitchen/knife)
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/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/frontier/ranged
/mob/living/simple_animal/hostile/human/frontier/ranged
icon_state = "frontiersmanranged"
icon_living = "frontiersmanranged"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
Expand All @@ -36,22 +23,7 @@
projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
casingtype = /obj/item/ammo_casing/a357

/mob/living/simple_animal/hostile/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/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/frontier/ranged/neutered
/mob/living/simple_animal/hostile/human/frontier/ranged/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)

/mob/living/simple_animal/hostile/human/frontier/ranged/mosin
Expand All @@ -62,22 +34,7 @@
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'

/mob/living/simple_animal/hostile/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/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/frontier/ranged/mosin/neutered
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper
Expand All @@ -90,22 +47,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/shotgun/brimstone)

/mob/living/simple_animal/hostile/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/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/frontier/ranged/trooper/neutered
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm
Expand All @@ -118,22 +60,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/skm)

/mob/living/simple_animal/hostile/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/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/frontier/ranged/trooper/skm/neutured
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/neutured
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle
Expand All @@ -145,22 +72,7 @@
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'

/mob/living/simple_animal/hostile/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/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/frontier/ranged/trooper/rifle/neutered
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy
Expand All @@ -175,22 +87,7 @@
projectiletype = /obj/projectile/beam/weak/penetrator
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy)

/mob/living/simple_animal/hostile/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/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/frontier/ranged/trooper/heavy/neutered
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless)

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

/mob/living/simple_animal/hostile/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/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/frontier/ranged/officer/neutured
/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/mob/simple_human.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.