diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 842e162517c..8c172f3592f 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -90,7 +90,7 @@ for(var/path in backpack_contents) var/number = backpack_contents[path] for(var/i in 1 to number) - H.equip_to_slot_or_del(new path(H), slot_in_backpack) + H.equip_or_collect(new path(H), slot_in_backpack) for(var/path in cybernetic_implants) var/obj/item/organ/internal/O = new path(H) diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index d08591ed40d..2fbf38a7e07 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -61,6 +61,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammacommander" item_color = "gammacommander" + species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/commander name = "emergency response team commander suit" @@ -71,6 +72,8 @@ /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma name = "elite emergency response team commander suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + icon_state = "ert_gcommander" + species_fit = null //Security /obj/item/clothing/head/helmet/space/hardsuit/ert/security @@ -85,6 +88,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammasecurity" item_color = "gammasecurity" + species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/security name = "emergency response team security suit" @@ -95,6 +99,8 @@ /obj/item/clothing/suit/space/hardsuit/ert/security/gamma name = "elite emergency response team security suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + icon_state = "ert_gsecurity" + species_fit = null //Engineer /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer @@ -110,6 +116,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammaengineer" item_color = "gammaengineer" + species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/engineer name = "emergency response team engineer suit" @@ -120,6 +127,8 @@ /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma name = "elite emergency response team engineer suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + icon_state = "ert_gengineer" + species_fit = null //Medical /obj/item/clothing/head/helmet/space/hardsuit/ert/medical @@ -133,6 +142,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammamedical" item_color = "gammamedical" + species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/medical name = "emergency response team medical suit" @@ -142,6 +152,8 @@ /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma name = "elite emergency response team medical suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + icon_state = "ert_gmedical" + species_fit = null //Janitor /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor @@ -155,6 +167,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammajanitor" item_color = "gammajanitor" + species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/janitor name = "emergency response team janitor suit" @@ -164,6 +177,8 @@ /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma name = "elite emergency response team janitor suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + icon_state = "ert_gjanitor" + species_fit = null //Paranormal /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 40e3ab36df1..f886c5e5e53 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -257,7 +257,7 @@ /obj/item/gun/projectile/automatic/lasercarbine name = "\improper IK-60 Laser Carbine" - desc = "An experimental carbine. Uses encased laser projectors as ammunition."//we need to uncouple the toroidal resistance dejammers + desc = "A short, compact carbine like rifle, relying more on battery cartridges rather than a built in power cell. Utilized by the Nanotrasen Navy for combat operations." icon_state = "lasercarbine" item_state = "laser" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 87b6cc45e21..f4ebec1a99d 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -293,7 +293,7 @@ l_pocket = /obj/item/reagent_containers/hypospray/safety/ert r_pocket = /obj/item/melee/classic_baton/telescopic - l_hand = /obj/item/defibrillator + l_hand = /obj/item/defibrillator/loaded backpack_contents = list( /obj/item/clothing/head/helmet/ert/medical = 1, diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 507dd7626e0..4858435cc5f 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -19,7 +19,6 @@ var/obj/item/organ/internal/replaced = M.get_organ_slot(slot) if(replaced) - to_chat(world, "[replaced] replaced by [src]") if(dont_remove_slot) non_primary = 1 else diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 0ceda8ea705..96d16435ca0 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c12484b28e4..b721063fcf9 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 535cad1596d..0aa2ad1f592 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 6c186e952e9..3651f3508cc 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ