Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmoryBlaine
AmoryBlaine committed Aug 5, 2024
1 parent 9860838 commit 72548b8
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 1,015 deletions.
12 changes: 2 additions & 10 deletions code/datums/supply_packs/black_market.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1059,15 +1059,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
new /obj/item/reagent_container/food/drinks/bottle/rum(loc)
loot_message = SPAN_NOTICE("It's a bunch of finished and unfinished molotovs.")
// That was the good 50%. Now it's time for the bad.
if(41 to 50)
// Random junk
new /obj/effect/essentials_set/random/clf_bonus_item(loc)
new /obj/effect/essentials_set/random/clf_bonus_item(loc)
new /obj/effect/essentials_set/random/clf_bonus_item(loc)
new /obj/effect/essentials_set/random/clf_bonus_item(loc)
new /obj/effect/essentials_set/random/clf_bonus_item(loc)
loot_message = SPAN_NOTICE("It's a bunch of random junk...")
if(51 to 70)
if(41 to 70)
new /obj/effect/spawner/random/bomb_supply(loc)
new /obj/effect/spawner/random/bomb_supply(loc)
new /obj/effect/spawner/random/toolbox(loc)
Expand All @@ -1084,7 +1076,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
var/mob/living/carbon/human/corpse = new (loc)
corpse.create_hud() //Need to generate hud before we can equip anything apparently...

var/corpse_type = pick(/datum/equipment_preset/corpse/clf/burst, /datum/equipment_preset/corpse/clf)
var/corpse_type = pick(/datum/equipment_preset/corpse/colonist, /datum/equipment_preset/corpse/prisoner)
arm_equipment(corpse, corpse_type, TRUE, FALSE) // I didn't choose the shitcode life, the shitcode life chose me

loot_message = SPAN_HIGHDANGER("IT'S A CORPSE!!")
Expand Down
41 changes: 0 additions & 41 deletions code/game/machinery/vending/vendor_types/antag/antag_clothing.dm
View file

This file was deleted.

109 changes: 0 additions & 109 deletions code/game/machinery/vending/vendor_types/antag/antag_gear.dm
View file

This file was deleted.

95 changes: 0 additions & 95 deletions code/game/objects/effects/landmarks/corpsespawner.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,98 +21,3 @@
/obj/effect/landmark/corpsespawner/prisoner
name = "Prisoner"
equip_path = /datum/equipment_preset/corpse/prisoner

/obj/effect/landmark/corpsespawner/doctor
name = "Doctor"
equip_path = /datum/equipment_preset/corpse/doctor

/obj/effect/landmark/corpsespawner/engineer
name = "Engineer"
equip_path = /datum/equipment_preset/corpse/engineer

/obj/effect/landmark/corpsespawner/scientist
name = "Scientist"
equip_path = /datum/equipment_preset/corpse/scientist

/obj/effect/landmark/corpsespawner/miner
name = "Shaft Miner"
equip_path = /datum/equipment_preset/corpse/miner

/obj/effect/landmark/corpsespawner/security
name = "Security"
equip_path = /datum/equipment_preset/corpse/security

/obj/effect/landmark/corpsespawner/security/marshal
name = "Colonial Marshal"
equip_path = /datum/equipment_preset/corpse/security/marshal

/obj/effect/landmark/corpsespawner/security/liaison
name = "Corporate Liaison"
equip_path = /datum/equipment_preset/corpse/security/liaison

/obj/effect/landmark/corpsespawner/prison_security
name = "Prison Guard"
equip_path = /datum/equipment_preset/corpse/prison_security

/////////////////Officers//////////////////////

/obj/effect/landmark/corpsespawner/commander
name = "Commanding Officer"
equip_path = /datum/equipment_preset/corpse/commander

/obj/effect/landmark/corpsespawner/wysec
name = "Weyland-Yutani Corporate Security Guard"
equip_path = /datum/equipment_preset/corpse/wysec

///CM specific jobs///

/obj/effect/landmark/corpsespawner/ua_riot
name = "UA Officer"
equip_path = /datum/equipment_preset/corpse/ua_riot

/obj/effect/landmark/corpsespawner/ua_riot/burst
name = "Burst UA Officer"
equip_path = /datum/equipment_preset/corpse/ua_riot/burst

/obj/effect/landmark/corpsespawner/wy/manager
name = "Corporate Supervisor"
equip_path = /datum/equipment_preset/corpse/wy/manager

/obj/effect/landmark/corpsespawner/wy/manager/burst
name = "Burst Corporate Supervisor"
equip_path = /datum/equipment_preset/corpse/ua_riot/burst


///////////Faction Specific Corpses//////////////////////

/obj/effect/landmark/corpsespawner/clf
name = "Colonial Liberation Front Soldier"
equip_path = /datum/equipment_preset/corpse/clf

/obj/effect/landmark/corpsespawner/clf/burst
name = "Burst Colonial Liberation Front Soldier"
equip_path = /datum/equipment_preset/corpse/clf/burst

/obj/effect/landmark/corpsespawner/upp
name = "Union of Progressive Peoples Soldier"
equip_path = /datum/equipment_preset/corpse/upp

/obj/effect/landmark/corpsespawner/upp/burst
name = "Burst Union of Progressive Peoples Soldier"
equip_path = /datum/equipment_preset/corpse/upp/burst

/obj/effect/landmark/corpsespawner/pmc
name = "Weyland-Yutani PMC (Standard)"
equip_path = /datum/equipment_preset/corpse/pmc

/obj/effect/landmark/corpsespawner/pmc/burst
name = "Burst Weyland-Yutani PMC (Standard)"
equip_path = /datum/equipment_preset/corpse/pmc/burst

/obj/effect/landmark/corpsespawner/freelancer
name = "Freelancer Mercenary"
equip_path = /datum/equipment_preset/corpse/freelancer

/obj/effect/landmark/corpsespawner/freelancer/burst
name = "Burst Freelancer Mercenary"
equip_path = /datum/equipment_preset/corpse/freelancer/burst
14 changes: 7 additions & 7 deletions code/modules/clothing/head/head.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
desc = "Worn by officers of special units."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head-layer/head_upp.dmi'
)
icon_state = "ivan_beret"
item_state = "ivan_beret"
Expand All @@ -384,7 +384,7 @@
desc = "A dark cap enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
)
icon_state = "cmbcap"
flags_armor_protection = BODY_FLAG_HEAD
Expand All @@ -404,7 +404,7 @@
desc = "A sturdy freelancer's cap. More protective than it seems."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
)
icon_state = "freelancer_cap"
siemens_coefficient = 2
Expand All @@ -431,7 +431,7 @@
desc = "A large hood in service with some militias, meant for obscurity on the frontier. Offers some head protection due to the study fibers utilized in production."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
)
icon_state = "rebel_hood"
siemens_coefficient = 2
Expand Down Expand Up @@ -480,7 +480,7 @@
icon = 'icons/obj/items/clothing/cm_hats.dmi'
flags_inv_hide = HIDETOPHAIR
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
)

/obj/item/clothing/head/durag/black
Expand All @@ -499,7 +499,7 @@
icon_state = "drillhat"
icon = 'icons/obj/items/clothing/cm_hats.dmi'
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
)

#undef HAT_GARB_RELAY_ICON_STATE
Expand Down Expand Up @@ -558,7 +558,7 @@
icon = 'icons/obj/items/clothing/cm_hats.dmi'
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
)

/obj/item/clothing/head/beret/royal_marine/team_leader
Expand Down
Loading

0 comments on commit 72548b8

Please sign in to comment.