From 9b7571989fd945f314e25f77d8b015f81f135fd9 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 08:38:57 +0100 Subject: [PATCH 01/14] RIG override unification A file containing rig/override To document every single icon override in a singular file. override will also be the Prototype module for mechanical fursuits. Basically this is a paper thin RIG --- .../clothing/spacesuits/rig/rig_unify_ch.dm | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 code/modules/clothing/spacesuits/rig/rig_unify_ch.dm diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm new file mode 100644 index 0000000000..3104663748 --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -0,0 +1,46 @@ +//This file will attempt to implement multiple overrides in a single file +//BAsicly the module look, the seperate part designs etc will all be design in here +//All sprites are going to go into a new DMI seperate from other RIGs +//This will be the groundwork for mechanical Fursuits + +/obj/item/weapon/rig/override + name = "override control module" + desc = "A Prototype suit not made for space, not made for combat, basically an expensive toy." + icon = 'icons/obj/rig_override_modules.dmi' //the look of the module itself + icon_state = "override_rig" + suit_type = "override suit" + //REEEEMOVE ARMOR + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //this will be purely cosmetic + emp_protection = 0 //No ARMOR + //TYPES + chest_type = /obj/item/clothing/suit/space/rig/override + helm_type = /obj/item/clothing/head/helmet/space/rig/override + boot_type = /obj/item/clothing/shoes/magboots/rig/override + glove_type = /obj/item/clothing/gloves/gauntlets/rig/override + cell_type = /obj/item/weapon/cell/high/hightech //implementing special cell override + //var/air_type = /obj/item/weapon/tank/oxygen + airtight = 0 //not airtight, nope + seal_delay = 5 //totally not based on the hacker suit + slowdown = 0 + offline_slowdown = 0 + //modular setup + req_access = list() + initial_modules = list() + +/obj/item/clothing/suit/space/rig/override + icon_state = "override_rig_suit" //this is experimental + name = "suit" + breach_threshold = 0 + +/obj/item/clothing/head/helmet/space/rig/override + icon_state = "override_rig_hood" //this is experimental + name = "hood" + +/obj/item/clothing/shoes/magboots/rig/override + icon_state = "override_rig_boots" //this is experimental + name = "shoes" + step_volume_mod = 1 + +/obj/item/clothing/gloves/gauntlets/rig/override + icon_state = "override_rig_gauntlets" //this is experimental + name = "gloves" From d92e25ad8ab60e1a7ec3cc64ac49d98384bcd566 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 08:57:55 +0100 Subject: [PATCH 02/14] Update rig_unify_ch.dm --- .../clothing/spacesuits/rig/rig_unify_ch.dm | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 3104663748..1e61ca6fbd 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -28,19 +28,75 @@ initial_modules = list() /obj/item/clothing/suit/space/rig/override + sprite_sheets = list( + SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', + SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', + SPECIES_UNATHI = 'icons/obj/rig_override_modules.dmi', + SPECIES_NEVREAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_AKULA = 'icons/obj/rig_override_modules.dmi', + SPECIES_SERGAL = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_FLAT = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/rig_override_modules.dmi', + SPECIES_VULPKANI = 'icons/obj/rig_override_modules.dmi', + SPECIES_PROMETHEAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', + SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', + ) icon_state = "override_rig_suit" //this is experimental name = "suit" breach_threshold = 0 /obj/item/clothing/head/helmet/space/rig/override + sprite_sheets = list( + SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', + SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', + SPECIES_UNATHI = 'icons/obj/rig_override_modules.dmi', + SPECIES_NEVREAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_AKULA = 'icons/obj/rig_override_modules.dmi', + SPECIES_SERGAL = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_FLAT = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/rig_override_modules.dmi', + SPECIES_VULPKANI = 'icons/obj/rig_override_modules.dmi', + SPECIES_PROMETHEAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', + SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', + ) icon_state = "override_rig_hood" //this is experimental name = "hood" /obj/item/clothing/shoes/magboots/rig/override + sprite_sheets = list( + SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', + SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', + SPECIES_UNATHI = 'icons/obj/rig_override_modules.dmi', + SPECIES_NEVREAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_AKULA = 'icons/obj/rig_override_modules.dmi', + SPECIES_SERGAL = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_FLAT = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/rig_override_modules.dmi', + SPECIES_VULPKANI = 'icons/obj/rig_override_modules.dmi', + SPECIES_PROMETHEAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', + SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', + ) icon_state = "override_rig_boots" //this is experimental name = "shoes" step_volume_mod = 1 /obj/item/clothing/gloves/gauntlets/rig/override + sprite_sheets = list( + SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', + SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', + SPECIES_UNATHI = 'icons/obj/rig_override_modules.dmi', + SPECIES_NEVREAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_AKULA = 'icons/obj/rig_override_modules.dmi', + SPECIES_SERGAL = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_FLAT = 'icons/obj/rig_override_modules.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/rig_override_modules.dmi', + SPECIES_VULPKANI = 'icons/obj/rig_override_modules.dmi', + SPECIES_PROMETHEAN = 'icons/obj/rig_override_modules.dmi', + SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', + SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', + ) icon_state = "override_rig_gauntlets" //this is experimental name = "gloves" From 85d73d59c837587e6acf0ebfb65907bbe92c1ae7 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 09:11:07 +0100 Subject: [PATCH 03/14] Update rig_unify_ch.dm --- .../modules/clothing/spacesuits/rig/rig_unify_ch.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 1e61ca6fbd..be2e2db37e 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -4,6 +4,7 @@ //This will be the groundwork for mechanical Fursuits /obj/item/weapon/rig/override + icon_override = 'icons/obj/rig_override_modules.dmi' name = "override control module" desc = "A Prototype suit not made for space, not made for combat, basically an expensive toy." icon = 'icons/obj/rig_override_modules.dmi' //the look of the module itself @@ -28,6 +29,8 @@ initial_modules = list() /obj/item/clothing/suit/space/rig/override + icon_override = 'icons/obj/rig_override_modules.dmi' + item_state = "override_worn_suit" sprite_sheets = list( SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', @@ -42,11 +45,14 @@ SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', ) + icon = 'icons/obj/rig_override_modules.dmi' icon_state = "override_rig_suit" //this is experimental name = "suit" breach_threshold = 0 /obj/item/clothing/head/helmet/space/rig/override + icon_override = 'icons/obj/rig_override_modules.dmi' + item_state = "override_worn_helmet" sprite_sheets = list( SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', @@ -61,10 +67,13 @@ SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', ) + icon = 'icons/obj/rig_override_modules.dmi' icon_state = "override_rig_hood" //this is experimental name = "hood" /obj/item/clothing/shoes/magboots/rig/override + item_state = "override_worn_boots" + icon_override = 'icons/obj/rig_override_modules.dmi' sprite_sheets = list( SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', @@ -79,11 +88,14 @@ SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', ) + icon = 'icons/obj/rig_override_modules.dmi' icon_state = "override_rig_boots" //this is experimental name = "shoes" step_volume_mod = 1 /obj/item/clothing/gloves/gauntlets/rig/override + item_state = "override_worn_gauntlets" + icon_override = 'icons/obj/rig_override_modules.dmi' sprite_sheets = list( SPECIES_TAJ = 'icons/obj/rig_override_modules.dmi', SPECIES_SKRELL = 'icons/obj/rig_override_modules.dmi', @@ -98,5 +110,6 @@ SPECIES_XENOHYBRID = 'icons/obj/rig_override_modules.dmi', SPECIES_VOX = 'icons/obj/rig_override_modules.dmi', ) + icon = 'icons/obj/rig_override_modules.dmi' icon_state = "override_rig_gauntlets" //this is experimental name = "gloves" From 52d4a6000c8fe36ecf6c6d948b02265b24c33d00 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 09:19:17 +0100 Subject: [PATCH 04/14] adding rig unify ch --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index 3b41a5192d..a84b438de2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1581,6 +1581,7 @@ #include "code\modules\clothing\spacesuits\rig\suits\merc.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" +#include "code\modules\clothing\spacesuits\rig\rig_unify_ch.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm" From 1aecb3192ff21122b2d29b99e7e04372c79fe002 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 09:54:40 +0100 Subject: [PATCH 05/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index be2e2db37e..16c8b4a5d6 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -29,6 +29,7 @@ initial_modules = list() /obj/item/clothing/suit/space/rig/override + species_restricted = list(SPECIES_UNATHI) //to be refined~ icon_override = 'icons/obj/rig_override_modules.dmi' item_state = "override_worn_suit" sprite_sheets = list( From 55aefc8390525abb1e8ceb5b5fcda637ccf0fac4 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 10:54:32 +0100 Subject: [PATCH 06/14] File upload for RIG OVERRIDE --- icons/obj/rig_override_modules.dmi | Bin 0 -> 4033 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/rig_override_modules.dmi diff --git a/icons/obj/rig_override_modules.dmi b/icons/obj/rig_override_modules.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c1ecc85720d4303cbb55c724e11aac2c3269f4bf GIT binary patch literal 4033 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 OKwsBHr&i19>3;wSpt%MB literal 0 HcmV?d00001 From dcde1e3a31764aa9241474c834a7401815cc15d5 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 11:34:41 +0100 Subject: [PATCH 07/14] Update rig_unify_ch.dm --- .../clothing/spacesuits/rig/rig_unify_ch.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 16c8b4a5d6..8b2bee8280 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -27,6 +27,23 @@ //modular setup req_access = list() initial_modules = list() + var/thingamount = 1 + +/obj/item/weapon/rig/override/New() + ..() + verbs += /obj/item/weapon/rig/override/proc/honk() + +/obj/item/weapon/rig/override/proc/makething() + set name = "Dispense Cooling unit" + set desc = "Yeah so like this makes a cooling unit" + set category = "Hardsuit" + var/location = get_turf(src) + if(thingamount) + new /obj/item/device/suit_cooling_unit(location) + thingamount=!thingamount + else + src << "There are no units left in this dispenser." + /obj/item/clothing/suit/space/rig/override species_restricted = list(SPECIES_UNATHI) //to be refined~ From 994dbd4aff03031f0dc931db20b9fbd0e1ab99a2 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 11:35:21 +0100 Subject: [PATCH 08/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 8b2bee8280..f876f0bdda 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -31,7 +31,7 @@ /obj/item/weapon/rig/override/New() ..() - verbs += /obj/item/weapon/rig/override/proc/honk() + verbs += /obj/item/weapon/rig/override/proc/makething() /obj/item/weapon/rig/override/proc/makething() set name = "Dispense Cooling unit" From 5302282c174b23372f0988200808fba7ab6e2ec9 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 13:36:18 +0100 Subject: [PATCH 09/14] Update rig_unify_ch.dm --- .../clothing/spacesuits/rig/rig_unify_ch.dm | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index f876f0bdda..1afc5aa8d6 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -31,8 +31,28 @@ /obj/item/weapon/rig/override/New() ..() - verbs += /obj/item/weapon/rig/override/proc/makething() + verbs += /obj/item/weapon/rig/override/proc/makething() + verbs += /obj/item/clothing/suit/space/rig/override/rename() + verbs += /obj/item/clothing/suit/space/rig/override/rename2() +/obj/item/clothing/suit/space/rig/override/rename()/ /Possible making Override suit into a protofursuit that can turn into any + set name = "Change icon" + set category = "Abilities" + set src in usr + var/n_name = sanitizeSafe(input(usr, "What state would you like to swap to?", "Icon hotswap", null) as text, MAX_NAME_LEN) + item_state = n_name + update_icon() + return +//Gonna turn these procs into a list to pic from instead later since letting people choose this much is silly +/obj/item/clothing/suit/space/rig/override/rename2() //Possible making Override suit into a protofursuit that can turn into any + set name = "Change icon" + set category = "Abilities" + set src in usr + var/n_name = sanitizeSafe(input(usr, "What dmi would you like to swap to?", "Icon hotswap", null) as text, MAX_NAME_LEN) + icon_override = n_name + update_icon() + return + /obj/item/weapon/rig/override/proc/makething() set name = "Dispense Cooling unit" set desc = "Yeah so like this makes a cooling unit" From f322294f14534ea81a681bee7e74cbff591ebb76 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 13:45:08 +0100 Subject: [PATCH 10/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 1afc5aa8d6..11171eaa76 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -44,7 +44,8 @@ update_icon() return //Gonna turn these procs into a list to pic from instead later since letting people choose this much is silly -/obj/item/clothing/suit/space/rig/override/rename2() //Possible making Override suit into a protofursuit that can turn into any +//Possible making Override suit into a protofursuit that can turn into any +/obj/item/clothing/suit/space/rig/override/rename2() set name = "Change icon" set category = "Abilities" set src in usr From 84d4f69252a65f2d0247799010bd5763f51a4fa0 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 13:54:26 +0100 Subject: [PATCH 11/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 11171eaa76..544f4e4005 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -29,6 +29,9 @@ initial_modules = list() var/thingamount = 1 + //Gonna turn these procs into a list to pic from instead later since letting people choose this much is silly + //Possible making Override suit into a protofursuit that can turn into any + /obj/item/weapon/rig/override/New() ..() verbs += /obj/item/weapon/rig/override/proc/makething() @@ -43,8 +46,7 @@ item_state = n_name update_icon() return -//Gonna turn these procs into a list to pic from instead later since letting people choose this much is silly -//Possible making Override suit into a protofursuit that can turn into any + /obj/item/clothing/suit/space/rig/override/rename2() set name = "Change icon" set category = "Abilities" From 454c7e309c00b7d4704923b65d446de20a694fdb Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 13:59:43 +0100 Subject: [PATCH 12/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 544f4e4005..0593ae1031 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -38,7 +38,7 @@ verbs += /obj/item/clothing/suit/space/rig/override/rename() verbs += /obj/item/clothing/suit/space/rig/override/rename2() -/obj/item/clothing/suit/space/rig/override/rename()/ /Possible making Override suit into a protofursuit that can turn into any +/obj/item/clothing/suit/space/rig/override/rename() //Possible making Override suit into a protofursuit that can turn into any set name = "Change icon" set category = "Abilities" set src in usr From e154693c4642a7e307e22910215db48b53d5e9d9 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 14:13:11 +0100 Subject: [PATCH 13/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 0593ae1031..3c75566d0a 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -38,7 +38,7 @@ verbs += /obj/item/clothing/suit/space/rig/override/rename() verbs += /obj/item/clothing/suit/space/rig/override/rename2() -/obj/item/clothing/suit/space/rig/override/rename() //Possible making Override suit into a protofursuit that can turn into any +/obj/item/clothing/suit/space/rig/override/proc/rename() //Possible making Override suit into a protofursuit that can turn into any set name = "Change icon" set category = "Abilities" set src in usr @@ -47,7 +47,7 @@ update_icon() return -/obj/item/clothing/suit/space/rig/override/rename2() +/obj/item/clothing/suit/space/rig/override/proc/rename2() set name = "Change icon" set category = "Abilities" set src in usr From 6943fc31cdfc0df4af226652bd4d7a9b4aac4af4 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Feb 2019 14:13:32 +0100 Subject: [PATCH 14/14] Update rig_unify_ch.dm --- code/modules/clothing/spacesuits/rig/rig_unify_ch.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm index 3c75566d0a..433625e693 100644 --- a/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm +++ b/code/modules/clothing/spacesuits/rig/rig_unify_ch.dm @@ -35,8 +35,8 @@ /obj/item/weapon/rig/override/New() ..() verbs += /obj/item/weapon/rig/override/proc/makething() - verbs += /obj/item/clothing/suit/space/rig/override/rename() - verbs += /obj/item/clothing/suit/space/rig/override/rename2() + verbs += /obj/item/clothing/suit/space/rig/override/proc/rename() + verbs += /obj/item/clothing/suit/space/rig/override/proc/rename2() /obj/item/clothing/suit/space/rig/override/proc/rename() //Possible making Override suit into a protofursuit that can turn into any set name = "Change icon"