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

Dynamic human icons #3462

Merged
merged 39 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
84dd7b8
dynamic human icons
FalloutFalcon Oct 1, 2024
71c6fa5
the helper
FalloutFalcon Oct 1, 2024
b2763d6
this is annoying
FalloutFalcon Oct 1, 2024
ffc02b5
ok this fixes it
FalloutFalcon Oct 1, 2024
d52784e
gives him his eyes back.
FalloutFalcon Oct 1, 2024
37f9915
cool!
FalloutFalcon Oct 1, 2024
2e1783e
refactor the frointersmen just a little to not reuse alot of code
FalloutFalcon Oct 1, 2024
b495ea0
Merge branch 'master' into dynamic-human-icons
FalloutFalcon Oct 1, 2024
d116e0c
fix unit tests
FalloutFalcon Oct 1, 2024
6e13b18
fix tests?
FalloutFalcon Oct 6, 2024
ace18d4
removes emmisives to test this
FalloutFalcon Oct 6, 2024
3312e73
porting some prs to fix issues i hope
FalloutFalcon Oct 7, 2024
3571925
handling for decals in unit test
FalloutFalcon Oct 7, 2024
b01244e
https://github.com/tgstation/tgstation/pull/71706
FalloutFalcon Oct 7, 2024
15704eb
small fix
FalloutFalcon Oct 7, 2024
247f0a4
i think that define was not true so should acctually work now
FalloutFalcon Oct 7, 2024
278e78a
test
FalloutFalcon Oct 7, 2024
3bdb037
Merge branch 'master' into dynamic-human-icons
FalloutFalcon Oct 8, 2024
4d9d42b
warning
FalloutFalcon Oct 10, 2024
b5d3aeb
these numbers were all inaccurate before i got here
FalloutFalcon Oct 10, 2024
8bf018c
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Oct 17, 2024
70c09f6
will this fix this?
FalloutFalcon Oct 18, 2024
d4775ec
Comment out validate overlay limit
FalloutFalcon Oct 18, 2024
a7a26a6
Acctually we can leave in the removal just dont error it.
FalloutFalcon Oct 18, 2024
44285dd
bad indentation
FalloutFalcon Oct 18, 2024
c6d0383
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Dec 28, 2024
e1bb810
yea
FalloutFalcon Dec 28, 2024
cdc81a4
unsed var, updating decal init
FalloutFalcon Dec 29, 2024
47d9a2b
swaps this to a warn
FalloutFalcon Dec 29, 2024
808e3c4
fixes crash?
FalloutFalcon Dec 29, 2024
98fbf2b
Merge branch 'master' into dynamic-human-icons
FalloutFalcon Jan 6, 2025
386aa9f
Merge branch 'master' into dynamic-human-icons
FalloutFalcon Jan 6, 2025
4fe3cfd
merge fix
FalloutFalcon Jan 7, 2025
151a804
Merge branch 'master' into dynamic-human-icons
FalloutFalcon Jan 14, 2025
547043f
Merge branch 'master' into dynamic-human-icons
FalloutFalcon Jan 15, 2025
dd64344
fix scorchers looking like troopers
FalloutFalcon Jan 16, 2025
6ca9822
readds armor_base i accidently removed with merge
FalloutFalcon Jan 16, 2025
270a7ba
fixes to the surgon and more netured fixed
FalloutFalcon Jan 16, 2025
90d7587
rename to not duplicate name
FalloutFalcon Jan 16, 2025
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
fixes to the surgon and more netured fixed
  • Loading branch information
FalloutFalcon committed Jan 16, 2025
commit 270a7baa49279e33a18b0dec3ccfc9c361aaeed5
7 changes: 7 additions & 0 deletions code/modules/mob/living/simple_animal/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,17 @@
/obj/effect/mob_spawn/human/corpse/frontier/surgeon
outfit = /datum/outfit/job/frontiersmen/doctor/corpse

/obj/effect/mob_spawn/human/corpse/frontier/surgeon/internals
outfit = /datum/outfit/job/frontiersmen/doctor/corpse/internals

/datum/outfit/job/frontiersmen/doctor/corpse
name = "Frontiersmen Surgeon Corpse"
r_pocket = null

/datum/outfit/job/frontiersmen/doctor/corpse/internals
mask = /obj/item/clothing/mask/breath
l_pocket = /obj/item/tank/internals/emergency_oxygen/engi

/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper
outfit = /datum/outfit/frontier/trooper

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@
desc = "A member of the brutal Frontiersman terrorist fleet! They appear to be a \"doctor\" of some sort, nervously swinging about some kind of makeshift syringe launcher."
icon_state = "frontiersmansurgeon"
icon_living = "frontiersmansurgeon"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
/obj/item/melee/knife/survival,
/obj/item/gun/syringe)

mob_spawner = /obj/effect/mob_spawn/human/corpse/frontier/surgeon
l_hand = /obj/item/melee/knife/survival
r_hand = /obj/item/gun/syringe
minimum_distance = 1
retreat_distance = null
projectiletype = /obj/projectile/bullet/dart/tranq
Expand All @@ -62,23 +61,15 @@
armor_base = /obj/item/clothing/suit/frontiersmen

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

/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/internals
icon_state = "frontiersmansurgeon_mask"
icon_living = "frontiersmansurgeon_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
/obj/item/melee/knife/survival,
/obj/item/gun/syringe,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
mob_spawner = /obj/effect/mob_spawn/human/corpse/frontier/surgeon/internals

/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/internals/neuter
icon_state = "frontiersmansurgeon_mask"
icon_living = "frontiersmansurgeon_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
neutered = TRUE

/mob/living/simple_animal/hostile/human/frontier/ranged/mosin
name = "Frontiersman Sharpshot"
Expand Down Expand Up @@ -152,7 +143,7 @@
ranged_cooldown = world.time + ranged_cooldown_time

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

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm
name = "Frontiersman Gunner"
Expand Down Expand Up @@ -216,9 +207,7 @@
mob_spawner = /obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/internals

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/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)
neutered = TRUE

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered
neutered = TRUE
Expand Down
Loading