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

changes equip_to_slot_or_del() to equip_or_collect() to prevent item deletion from backpack_contents list

Browse Source 
numerous bugfixes
adds new suit sprites
This commit is contained in:
Birdtalon
2018-10-07 22:32:44 +01:00
parent 074ee967e5
commit f36b0a4bff
9 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/ert.dm
+15
View File
@@ -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
code/modules/projectiles/guns/projectile/automatic.dm
+1 -1
View File
@@ -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
code/modules/response_team/ert_outfits.dm
+1 -1
View File
@@ -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,
code/modules/surgery/organs/organ_internal.dm
-1
View File
@@ -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