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

XM-CL ANCW: Caustic Armor for research #6592

Draft
wants to merge 60 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
46321fd
all the sprites
TheManWithNoHands Jun 28, 2024
9b88c94
code and lore and errors
TheManWithNoHands Jun 29, 2024
ae2671a
little fixes
TheManWithNoHands Jun 29, 2024
8f5a577
check fix
TheManWithNoHands Jun 29, 2024
69c8c93
temp
TheManWithNoHands Jun 29, 2024
58ae77e
Price changes + package
TheManWithNoHands Jun 29, 2024
80def15
ligthly to cheap
TheManWithNoHands Jun 29, 2024
5a5733c
Update code/datums/research_upgrade_datum.dm
TheManWithNoHands Jun 29, 2024
a3a0ee2
little fixes
TheManWithNoHands Jun 29, 2024
0f4d6b1
Merge branch 'caustic-marine-armor' of https://github.com/TheManWithN…
TheManWithNoHands Jun 29, 2024
64fba3e
code fixes
TheManWithNoHands Jun 30, 2024
fafd366
new sprite colors
TheManWithNoHands Jul 1, 2024
2c868d8
shocking nerf
TheManWithNoHands Jul 1, 2024
2cfec82
armor re-balance
TheManWithNoHands Jul 2, 2024
e6cf062
fancy up
TheManWithNoHands Jul 2, 2024
16f668e
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 3, 2024
174e88c
Update code/modules/clothing/suits/marine_armor/_marine_armor.dm
TheManWithNoHands Jul 5, 2024
4a634f4
Merge branch 'caustic-marine-armor' of https://github.com/TheManWithN…
TheManWithNoHands Jul 5, 2024
037ab16
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 5, 2024
958f5af
Merge branch 'caustic-marine-armor' of https://github.com/TheManWithN…
TheManWithNoHands Jul 5, 2024
ed833c7
removes slop
TheManWithNoHands Jul 5, 2024
e9bbbed
resolving conflicts
TheManWithNoHands Jul 6, 2024
95abe7e
resolve conflicts
TheManWithNoHands Jul 6, 2024
5428264
conflict solved?
TheManWithNoHands Jul 6, 2024
f2a590c
this has to resolve
TheManWithNoHands Jul 6, 2024
4ef84b0
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 6, 2024
f97a518
name alignment
TheManWithNoHands Jul 6, 2024
cba269c
Reworked Lore
TheManWithNoHands Jul 17, 2024
5133b98
conflict fix-1
TheManWithNoHands Jul 17, 2024
81f545b
conflict fix-2
TheManWithNoHands Jul 17, 2024
eb11edf
conflict fix-3
TheManWithNoHands Jul 17, 2024
457fc94
conflict fix-please
TheManWithNoHands Jul 17, 2024
1a632ea
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 17, 2024
e17b157
:O
TheManWithNoHands Jul 17, 2024
42c55b2
please got dont break
TheManWithNoHands Jul 17, 2024
84e7d06
¯\_(ツ)_/¯
TheManWithNoHands Jul 17, 2024
3bac555
fix?
TheManWithNoHands Jul 17, 2024
3100a4b
fixes
TheManWithNoHands Jul 25, 2024
b69c4e6
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 25, 2024
4e48442
fix-2 and lower melle-armor
TheManWithNoHands Jul 25, 2024
64ea261
fix?
TheManWithNoHands Jul 25, 2024
ea1bbfb
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 26, 2024
502e2a4
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Jul 27, 2024
999ba0f
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Aug 4, 2024
b0d2772
fixes and rebalance
TheManWithNoHands Aug 5, 2024
b02d47a
Update code/modules/clothing/suits/marine_armor/_marine_armor.dm
TheManWithNoHands Aug 6, 2024
1b62a8c
Update code/modules/clothing/suits/marine_armor/_marine_armor.dm
TheManWithNoHands Aug 6, 2024
ae5f6ac
fixes some sprites
TheManWithNoHands Aug 6, 2024
c8642db
Merge branch 'caustic-marine-armor' of https://github.com/TheManWithN…
TheManWithNoHands Aug 6, 2024
1f9e662
Merge branch 'master' into caustic-marine-armor
TheManWithNoHands Aug 6, 2024
f108b2c
adds a note
TheManWithNoHands Aug 6, 2024
b4d4e06
Merge branch 'caustic-marine-armor' of https://github.com/TheManWithN…
TheManWithNoHands Aug 6, 2024
8854dcf
Update code/datums/research_upgrade_datum.dm
TheManWithNoHands Aug 9, 2024
e4b1e47
Update code/modules/clothing/head/helmet.dm
TheManWithNoHands Aug 9, 2024
1b83c8a
Merge remote-tracking branch 'upstream/master' into caustic-marine-armor
TheManWithNoHands Aug 9, 2024
3b8fa6e
revert to older stats, and price reduction
TheManWithNoHands Aug 11, 2024
de0a334
fixes and upsy wuppsy, owy wowy :3
TheManWithNoHands Aug 11, 2024
ef77c95
im to dumb to read :D
TheManWithNoHands Aug 11, 2024
e8e5acc
slop_removal
TheManWithNoHands Aug 12, 2024
6cdb762
we love FF
TheManWithNoHands Aug 13, 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
9 changes: 9 additions & 0 deletions code/datums/research_upgrade_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,12 @@
minimum_price = 100
item_reference = /obj/item/clothing/accessory/health/research_plate/anti_decay

/datum/research_upgrades/armor/caustic
name = "XM-CL Armor Kit"
desc = "Part of an experimental armor set using the ANCW system to withstand acid."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
value_upgrade = 2500
on_init_argument = RESEARCH_UPGRADE_NOTHING_TO_PASS
behavior = RESEARCH_UPGRADE_ITEM
clearance_req = 5
upgrade_type = ITEM_ARMOR_UPGRADE
item_reference = /obj/item/storage/box/kit/caustic
15 changes: 15 additions & 0 deletions code/modules/clothing/gloves/marine_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,18 @@
item_state = "cbrn"
armor_bio = CLOTHING_ARMOR_GIGAHIGHPLUS
armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS

//=RESEARCH ARMOR=\\

/obj/item/clothing/gloves/marine/caustic
name = "\improper XM-CL Gloves"
desc = "A pair of ANCW Gloves. Their insides are incredibly soft and cool to the touch."
icon_state = "caustic_h"
item_state = "caustic_h"
siemens_coefficient = 1
armor_bullet = CLOTHING_ARMOR_VERYLOW
armor_laser = CLOTHING_ARMOR_VERYLOW
armor_bio = CLOTHING_ARMOR_HIGHPLUS
armor_rad = CLOTHING_ARMOR_HIGHPLUS
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
adopts_squad_color = FALSE
21 changes: 20 additions & 1 deletion code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
siemens_coefficient = 0.7


//===========================//MARINES HELMETS\\=================================\\
//=======================================================================\\

Expand Down Expand Up @@ -995,6 +994,26 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
built_in_visors = list(new /obj/item/device/helmet_visor/night_vision/marine_raider, new /obj/item/device/helmet_visor/security)
start_down_visor_type = /obj/item/device/helmet_visor/night_vision/marine_raider

//=============================//Research\\==================================\\

/obj/item/clothing/head/helmet/marine/caustic
name = "\improper XM10-CL Helmet"
desc = "It's an ANCW Helmet. It is fitted with an integrated gas mask and visor. The inside is cushioned with cool gel pads to protect against harsh temperature changes and heavy impacts."
icon_state = "caustic_h"
item_state = "caustic_h"
armor_bullet = CLOTHING_ARMOR_VERYLOW
armor_laser = CLOTHING_ARMOR_VERYLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_HIGH
armor_rad = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT
flags_cold_protection = BODY_FLAG_HEAD
siemens_coefficient = 1
flags_inventory = BLOCKSHARPOBJ|COVERMOUTH|COVEREYES|ALLOWINTERNALS|BLOCKGASEFFECT|ALLOWREBREATH|ALLOWCPR
flags_inv_hide = HIDEEYES|HIDELOWHAIR|HIDEFACE

//=============================//PMCS\\==================================\\
//=======================================================================\\

Expand Down
15 changes: 15 additions & 0 deletions code/modules/clothing/shoes/marine_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,21 @@
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
spawn_item_type = /obj/item/attachable/bayonet

/obj/item/clothing/shoes/marine/caustic
name = "\improper XM-CL combat boots"
desc = "A pair of ANCW Boots. Their insides are cushioned with soft gel pads to give you an optimal footbed. You wish you had a pair like this at home."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "caustic_h"
item_state = "caustic_h"
armor_bullet = CLOTHING_ARMOR_VERYLOW
armor_laser = CLOTHING_ARMOR_VERYLOW
armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH
armor_bio = CLOTHING_ARMOR_HIGH
armor_rad = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
min_cold_protection_temperature = SHOE_MIN_COLD_PROT
max_heat_protection_temperature = SHOE_MAX_HEAT_PROT
siemens_coefficient = 1

/obj/item/clothing/shoes/dress
name = "dress shoes"
desc = "Pre-polished fancy dress shoes. You can see your reflection in them."
Expand Down
43 changes: 43 additions & 0 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -682,3 +682,46 @@
icon_state = "cc_armor"
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE

//==================Research Armor==================\\

/obj/item/clothing/suit/storage/marine/caustic
name = "\improper XM3-CL Armor"
desc = "A lightweight piece of XM3-CL ANCW armor. It has incredibly soft cushioning on the inside, thanks to the gel pads. A truck could hit you and you will be fine in this."
desc_lore = "An experimental model of Anti-Caustic Light armormend, or XM3-CL, developed against the xenomorph threat by the USMC and WY. Based on the Model 3 Light Armor, this armor system has been modified to allow soldiers to perform unrestricted in battle. It uses CN-Gel to neutralize even the heaviest of xenomorph acids, turning their PH level to 7, which then glides right off the ultrahydrophobic surface on the armor plates. Its insides are lined with a combination of fiber and gel cushioning, serving as a storage for the CN-Gel, and protecting the user from heavy impacts. CN-Gel also serves as a great insulator, protecting the user from from the harshest of colds, to the blazing sun. Allowing the user to perform in any environment. The weight of the internal systems required the XM3-CL armor to be striped down tremendously, barely leaving room for any form of protection against projectiles. Making it unsuitable for combat against human combatants. The biological functions of XX-121 revealed to WY and USMC scientists the anti caustic properties in their bodily fluids and allowed them to create a version of the gel using XX-121 bio-matter, primarily their saliva, as a base for a Compound Neutralizing Gel, or CN-Gel. Resulting in a clear, thermoinsulating, thick, and overall economic gel. The Gel itself expands greatly when oxidized though the internal nozzles, allowing XM3-CL Armor system to be fully operational for weeks before needing to be refilled."
icon = 'icons/obj/items/clothing/cm_suits.dmi'
icon_state = "caustic_h"
item_state = "caustic_h"
flags_atom = parent_type::flags_atom | NO_NAME_OVERRIDE|NO_SNOW_TYPE //Code i dont remember writing, and only learned about afterwards. Applys the parents flags to the atom. The more you know. Dont remove the ghost code, it migth haunt you.
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_VERYLOW
armor_energy = CLOTHING_ARMOR_VERYLOW
armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH
armor_bio = CLOTHING_ARMOR_HIGH
armor_rad = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT
storage_slots = 2
siemens_coefficient = 1
slowdown = SLOWDOWN_ARMOR_LIGHT

/obj/item/clothing/suit/storage/marine/caustic/equipped(mob/user, slot)
if(slot == WEAR_JACKET)
RegisterSignal(user, COMSIG_LIVING_FLAMER_CROSSED, PROC_REF(flamer_fire_callback))
..()


/obj/item/clothing/suit/storage/marine/caustic/proc/flamer_fire_callback(mob/living/L, datum/reagent/R)
SIGNAL_HANDLER

if(R.fire_penetrating)
return

. = COMPONENT_NO_IGNITE

/obj/item/clothing/suit/storage/marine/caustic/dropped(mob/user)
if (!istype(user))
return
UnregisterSignal(user,
COMSIG_LIVING_FLAMER_CROSSED
)
..()
14 changes: 14 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,20 @@
icon_state = "mercenary_engineer_uniform"
worn_state = "mercenary_engineer_uniform"

// Research Armnor \\

/obj/item/clothing/under/marine/caustic
name = "\improper ANCW Unifrom"
desc = "A modified version of standart issue USMC uniform. Lacking Kevlar, it possses soft gel pads instead. It almost feels like wearing a pyjama."
siemens_coefficient = 1
icon_state = "caustic_h"
worn_state = "caustic_h"
armor_bullet = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_NONE
armor_bio = CLOTHING_ARMOR_LOW
armor_rad = CLOTHING_ARMOR_LOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
drop_sound = "armorequip"

////// Civilians /////////

Expand Down
11 changes: 11 additions & 0 deletions code/modules/cm_marines/equipment/kit_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -582,3 +582,14 @@
new /obj/item/storage/pouch/construction/low_grade_full(src)
new /obj/item/storage/pouch/electronics/full(src)
new /obj/item/clothing/glasses/welding(src)

/obj/item/storage/box/kit/caustic
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
name = "\improper XM-CL Armor Kit"
pro_case_overlay = "haz"

/obj/item/storage/box/kit/caustic/fill_preset_inventory()
new /obj/item/clothing/suit/storage/marine/caustic(src)
new /obj/item/clothing/head/helmet/marine/caustic(src)
new /obj/item/clothing/gloves/marine/caustic(src)
new /obj/item/clothing/shoes/marine/caustic(src)
new /obj/item/clothing/under/marine/caustic(src)
Binary file modified icons/mob/humans/onmob/feet.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/hands.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.
Binary file modified icons/obj/items/storage.dmi
Binary file not shown.
Loading