cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates a couple of /obj/item variables (#29829)

Browse Source 
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
This commit is contained in:
kyunkyunkyun
2025-09-14 15:23:56 +00:00
committed by GitHub
parent 500c6b16fe
commit 8821ab9a66
418 changed files with 1750 additions and 3810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/mod_clothes.dm
+8 -12
View File
@@ -4,8 +4,7 @@
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
icon_state = "standard-helmet"
base_icon_state = "helmet"
item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
heat_protection = HEAD
cold_protection = HEAD
permeability_coefficient = 0.01
@@ -15,7 +14,7 @@
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
"Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
)
/obj/item/clothing/suit/mod
name = "MOD chestplate"
@@ -23,8 +22,7 @@
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
icon_state = "standard-chestplate"
base_icon_state = "chestplate"
item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
blood_overlay_type = "armor"
allowed = list(
/obj/item/tank/internals,
@@ -42,7 +40,7 @@
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
"Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
)
/obj/item/clothing/gloves/mod
@@ -51,8 +49,7 @@
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
icon_state = "standard-gauntlets"
base_icon_state = "gauntlets"
item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
body_parts_covered = HANDS|ARMS
heat_protection = HANDS|ARMS
cold_protection = HANDS|ARMS
@@ -62,7 +59,7 @@
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
"Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
)
/obj/item/clothing/shoes/mod
@@ -71,8 +68,7 @@
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
icon_state = "standard-boots"
base_icon_state = "boots"
item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
body_parts_covered = FEET|LEGS
heat_protection = FEET|LEGS
cold_protection = FEET|LEGS
@@ -82,4 +78,4 @@
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
"Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
)
code/modules/mod/mod_control.dm
+3 -6
View File
@@ -2,15 +2,14 @@
/obj/item/mod
name = "Base MOD"
desc = "You should not see this, yell at a coder!"
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'// figure out how to work with 2 of these
icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
/obj/item/mod/control
name = "MOD control unit"
desc = "The control unit of a Modular Outerwear Device, a powered suit that protects against various environments."
icon_state = null
item_state = "mod_control"
base_icon_state = "control"
inhand_icon_state = "mod_control"
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
strip_delay = 10 SECONDS
@@ -572,8 +571,6 @@
SEND_SIGNAL(src, COMSIG_MOD_WEARER_SET, wearer)
RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
update_charge_alert()
for(var/obj/item/clothing/C in mod_parts)
C.refit_for_species(wearer.dna.species.sprite_sheet_name)
update_mod_overlays()
for(var/obj/item/mod/module/module as anything in modules)
module.on_equip()
code/modules/mod/mod_core.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "A non-functional MOD core. Inform the admins if you see this."
icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
icon_state = "mod-core"
item_state = "electronic"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
/// MOD unit we are powering.
code/modules/mod/modules/modules_antag.dm
+1 -1
View File
@@ -457,7 +457,7 @@
mod.icon_state = "[mod.skin]-control"
var/list/mod_skin = mod.theme.skins[mod.skin]
mod.icon = mod_skin[MOD_ICON_OVERRIDE] || 'icons/obj/clothing/modsuit/mod_clothing.dmi'
mod.icon_override = mod_skin[MOD_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi'
mod.worn_icon = mod_skin[MOD_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi'
mod.lefthand_file = initial(mod.lefthand_file)
mod.righthand_file = initial(mod.righthand_file)
mod.wearer.update_inv_back()
code/modules/mod/modules/modules_security.dm
-1
View File
@@ -262,7 +262,6 @@
/// Mob that threw the grenade.
var/mob/living/thrower
/obj/item/grenade/cryogrenade_mod/Destroy()
thrower = null
return ..()