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

Movielike Spawning (Satchel on Spawn Removal) #215

Closed
wants to merge 22 commits into from
Closed

Movielike Spawning (Satchel on Spawn Removal) #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0ac9b91
Da Revolva
Mar 27, 2024
b1f8fc5
Oopsiedaisies
Mar 27, 2024
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 30, 2024
e747764
Revert "Oopsiedaisies"
Mar 30, 2024
c3cee8a
Auto stash before revert of "Oopsiedaisies"
Mar 30, 2024
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 31, 2024
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 3, 2024
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 5, 2024
c2cddcd
HIIIIIIIIIIIIIIII
Apr 5, 2024
61011d6
Additional service uniform parts
Apr 5, 2024
17c274b
Hat
Apr 5, 2024
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 7, 2024
e1f07aa
Service Uniform Removal
Apr 7, 2024
e35bdad
Boiler Suit Stuff
Apr 7, 2024
e8bba41
Woops
Apr 7, 2024
584b198
Woopsv2
Apr 7, 2024
e620ee7
Finishes Boiler Shit
Apr 7, 2024
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 8, 2024
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 10, 2024
58e9a9a
Unboiler's your suit
Apr 12, 2024
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 23, 2024
2f6049f
Merge branch 'fucksatchels' of https://github.com/Max-023/PvE-CMSS13 …
Apr 23, 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
1 change: 0 additions & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@
if(has_cryo_gear)
new /obj/item/clothing/under/marine(src)
new /obj/item/clothing/shoes/marine/knife(src)
new /obj/item/device/radio/headset/almayer/marine(src)
60 changes: 0 additions & 60 deletions code/modules/gear_presets/uscm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@
minimap_icon = "private"

/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/pfc/cryo
name = "USCM Cryo Squad Rifleman"
Expand Down Expand Up @@ -125,11 +120,6 @@
paygrade = "ME3"

/datum/equipment_preset/uscm/pfc/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)


/datum/equipment_preset/uscm/pfc/forecon/lesser_rank
Expand All @@ -151,11 +141,6 @@
minimap_icon = "smartgunner"

/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/sg/cryo
name = "USCM Cryo Squad Smartgunner"
Expand Down Expand Up @@ -193,11 +178,6 @@
paygrade = "ME5"

/datum/equipment_preset/uscm/sg/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/sg/forecon/lesser_rank
paygrade = "ME4"
Expand Down Expand Up @@ -235,11 +215,6 @@
minimap_icon = "rto"

/datum/equipment_preset/uscm/rto/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/rto/lesser_rank
paygrade = "ME3"
Expand Down Expand Up @@ -425,11 +400,6 @@
utility_under = list(/obj/item/clothing/under/marine/medic)

/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/medic
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/medic

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/medic/cryo
name = "USCM Cryo Squad Hospital Corpsman"
Expand Down Expand Up @@ -467,11 +437,6 @@
paygrade = "ME5"

/datum/equipment_preset/uscm/medic/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/medic/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/medic/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/medic/forecon/lesser_rank
paygrade = "ME4"
Expand All @@ -491,11 +456,6 @@
minimap_icon = "tl"

/datum/equipment_preset/uscm/tl/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/tl/cryo
name = "USCM Cryo Squad Sergeant"
Expand Down Expand Up @@ -526,11 +486,6 @@
paygrade = "ME6"

/datum/equipment_preset/uscm/tl/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/*****************************************************************************************************/

Expand All @@ -550,11 +505,6 @@
utility_under = list(/obj/item/clothing/under/marine/engineer)

/datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/tech

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/engineer/cryo
name = "USCM Cryo Squad Combat Technician"
Expand All @@ -580,11 +530,6 @@
minimap_icon = "leader"

/datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/cryo
name = "USCM Cryo Platoon Sergeant"
Expand Down Expand Up @@ -621,11 +566,6 @@
paygrade = "ME8"

/datum/equipment_preset/uscm/leader/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/forecon/lesser_rank
paygrade = "ME7"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/bridge(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked/service(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
Expand Down
3 changes: 2 additions & 1 deletion maps/map_files/golden_arrow/golden_arrow.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4933,7 +4933,8 @@
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/under/marine/officer/boiler,
/obj/item/clothing/head/cmcap/bridge,
/turf/open/floor/almayer{
dir = 4;
icon_state = "cargo_arrow"
Expand Down
Loading