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

Removes duplicate definitions in types (#25702)

Browse Source 
* Removes duplicate definitions

* One more
This commit is contained in:
DGamerL
2024-06-06 18:56:03 +00:00
committed by GitHub
parent ac5a4dfe11
commit 37ffe943e4
33 changed files with 13 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/job_hats.dm
+1 -2
View File
@@ -2,10 +2,9 @@
//Bartender
/obj/item/clothing/head/chefhat
name = "chef's hat"
desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
desc = "The commander in chef's head wear."
icon_state = "chef"
item_state = "chef"
desc = "The commander in chef's head wear."
strip_delay = 10
put_on_delay = 10
dog_fashion = /datum/dog_fashion/head/chef
code/modules/clothing/masks/misc_masks.dm
-1
View File
@@ -416,7 +416,6 @@
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
actions_types = list(/datum/action/item_action/adjust)
can_toggle = TRUE
/obj/item/clothing/mask/bandana/attack_self(mob/user)
adjustmask(user)
code/modules/clothing/spacesuits/ert_hardsuits.dm
+3 -4
View File
@@ -57,12 +57,11 @@
icon_state = "ert_commander"
item_state = "suit-command"
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
/obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
/obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert
strip_delay = 130
resistance_flags = FIRE_PROOF
code/modules/clothing/spacesuits/syndi.dm
+1 -2
View File
@@ -1,10 +1,9 @@
//Regular syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
desc = "Top secret Spess Helmet."
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
icon_state = "syndicate"
item_state = "syndicate"
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
code/modules/clothing/under/costumes.dm
-1
View File
@@ -173,7 +173,6 @@
name = "tourist outfit"
desc = "A light blue shirt with brown shorts. Feels oddly spooky."
icon_state = "tourist"
icon_state = "tourist"
item_color = "tourist"
/obj/item/clothing/under/costume/singery