Skip to content

Commit

Permalink
Malf suits closet and jetpack removal (#6729)
Browse files Browse the repository at this point in the history
# About the pull request

never used nowhere cut it cut it

# Explain why it's good for the game

less mess in files


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
del: Removed malfanction closet
/:cl:

---------

Co-authored-by: vincibrv <[email protected]>
  • Loading branch information
cuberound and uuuuhuuuu authored Jul 18, 2024
1 parent afa6a17 commit d1d4926
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 133 deletions.
85 changes: 0 additions & 85 deletions code/game/objects/items/tanks/jetpack.dm

This file was deleted.

16 changes: 0 additions & 16 deletions code/game/objects/structures/crates_lockers/closets/malfunction.dm

This file was deleted.

23 changes: 0 additions & 23 deletions code/modules/gear_presets/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -504,29 +504,6 @@
new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES)
new_human.equip_if_possible(new /obj/item/clipboard, WEAR_WAIST)

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

/datum/equipment_preset/other/compression_suit
name = "Mk50 Compression Suit"
flags = EQUIPMENT_PRESET_EXTRA
faction = FACTION_PMC
skills = /datum/skills/pfc
idtype = /obj/item/card/id/data

/datum/equipment_preset/other/compression_suit/load_gear(mob/living/carbon/human/new_human)
//TODO: add backpacks and satchels
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots, WEAR_FEET)

new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/space/compression, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/compression, WEAR_HEAD)
var /obj/item/tank/jetpack/J = new /obj/item/tank/jetpack/oxygen(new_human)
new_human.equip_to_slot_or_del(J, WEAR_BACK)
J.toggle()
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, WEAR_FACE)
J.Topic(null, list("stat" = 1))
spawn_merc_weapon(new_human)


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

Expand Down
6 changes: 0 additions & 6 deletions code/modules/mob/living/carbon/human/human_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@
//Can we act
if(is_mob_restrained()) return 0

//Do we have a working jetpack
if(istype(back, /obj/item/tank/jetpack))
var/obj/item/tank/jetpack/J = back
if(((!check_drift) || (check_drift && J.stabilization_on)) && (body_position == STANDING_UP) && (J.allow_thrust(0.01, src)))
inertia_dir = 0
return 1
// if(!check_drift && J.allow_thrust(0.01, src))
// return 1

Expand Down
2 changes: 0 additions & 2 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,6 @@
#include "code\game\objects\items\storage\toolbox.dm"
#include "code\game\objects\items\storage\toolkit.dm"
#include "code\game\objects\items\storage\wallets.dm"
#include "code\game\objects\items\tanks\jetpack.dm"
#include "code\game\objects\items\tanks\tank_types.dm"
#include "code\game\objects\items\tanks\tanks.dm"
#include "code\game\objects\items\tools\cleaning_tools.dm"
Expand Down Expand Up @@ -1345,7 +1344,6 @@
#include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
#include "code\game\objects\structures\crates_lockers\closets\job_closets.dm"
#include "code\game\objects\structures\crates_lockers\closets\l3closet.dm"
#include "code\game\objects\structures\crates_lockers\closets\malfunction.dm"
#include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm"
#include "code\game\objects\structures\crates_lockers\closets\wall_locker.dm"
#include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
Expand Down
1 change: 0 additions & 1 deletion maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -25377,7 +25377,6 @@
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
"tpE" = (
/obj/item/tank/jetpack/carbondioxide,
/obj/structure/surface/rack,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
Expand Down

0 comments on commit d1d4926

Please sign in to comment.