cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes some of the issues of the createanddestroy unit test (#7648)

Browse Source 
* send help

* polychromic createanddestroy fix
This commit is contained in:
jjpark-kb
2021-08-20 23:23:23 -04:00
committed by GitHub
parent c8a695ebfc
commit 6dfd617177
59 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -174,6 +174,6 @@
/obj/item/multitool/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
name = "electronic multitool"
desc = "Optimised version of a regular multitool. Streamlines processes handled by its internal microchip."
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "multitool_cyborg"
toolspeed = 0.5
code/game/objects/items/kitchen.dm
+1 -1
View File
@@ -232,7 +232,7 @@
/obj/item/kitchen/knife/combat/cyborg
name = "cyborg knife"
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "knife_cyborg"
desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
code/game/objects/items/tools/crowbar.dm
+1 -1
View File
@@ -201,7 +201,7 @@
/obj/item/crowbar/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
name = "hydraulic crowbar"
desc = "A hydraulic prying tool, simple but powerful."
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "crowbar_cyborg"
worn_icon_state = "crowbar"
usesound = 'sound/items/jaws_pry.ogg'
code/game/objects/items/tools/screwdriver.dm
+1 -1
View File
@@ -172,7 +172,7 @@
/obj/item/screwdriver/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
name = "automated screwdriver"
desc = "A powerful automated screwdriver, designed to be both precise and quick."
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "screwdriver_cyborg"
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
code/game/objects/items/tools/weldingtool.dm
+1 -1
View File
@@ -324,7 +324,7 @@
/obj/item/weldingtool/largetank/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
name = "integrated welding tool"
desc = "An advanced welder designed to be used in robotic systems. Custom framework doubles the speed of welding."
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "indwelder_cyborg"
toolspeed = 0.5
code/game/objects/items/tools/wirecutters.dm
+1 -1
View File
@@ -76,7 +76,7 @@
/obj/item/wirecutters/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
name = "powered wirecutters"
desc = "Cuts wires with the power of ELECTRICITY. Faster than normal wirecutters."
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "wirecutters_cyborg"
worn_icon_state = "cutters"
toolspeed = 0.5
code/game/objects/items/tools/wrench.dm
+1 -1
View File
@@ -74,7 +74,7 @@
/obj/item/wrench/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
name = "hydraulic wrench"
desc = "An advanced robotic wrench, powered by internal hydraulics. Twice as fast as the handheld version."
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "wrench_cyborg"
toolspeed = 0.5
code/game/objects/items/toys.dm
+2 -2
View File
@@ -244,7 +244,7 @@
/obj/item/toy/gun
name = "cap gun"
desc = "Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps."
icon = 'icons/obj/guns/ballistic.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
icon_state = "revolver"
inhand_icon_state = "gun"
worn_icon_state = "gun"
@@ -1570,7 +1570,7 @@
/obj/item/toy/foamfinger
name = "foam finger"
desc = "root for the home team! wait, does this station even have a sports team?"
icon = 'icons/obj/guns/ballistic.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
icon_state = "foamfinger"
inhand_icon_state = "foamfinger_inhand"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
code/game/objects/items/weaponry.dm
+1 -1
View File
@@ -230,7 +230,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
playsound(user, 'sound/items/screwdriver2.ogg', 50, TRUE)
/obj/item/claymore/highlander/robot //BLOODTHIRSTY BORGS NOW COME IN PLAID
icon = 'icons/obj/items_cyborg.dmi'
icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
icon_state = "claymore_cyborg"
var/mob/living/silicon/robot/robot