cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Cyberboss
2017-03-30 19:18:59 -04:00
parent 2fd142959a 272bedcbd0
commit 5646c736c8
102 changed files with 8157 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_parts.dm
+6 -6
View File
@@ -42,17 +42,17 @@
/obj/item/robot_suit/proc/updateicon()
cut_overlays()
if(l_arm)
add_overlay("l_arm+o")
add_overlay("[l_arm.icon_state]+o")
if(r_arm)
add_overlay("r_arm+o")
add_overlay("[r_arm.icon_state]+o")
if(chest)
add_overlay("chest+o")
add_overlay("[chest.icon_state]+o")
if(l_leg)
add_overlay("l_leg+o")
add_overlay("[l_leg.icon_state]+o")
if(r_leg)
add_overlay("r_leg+o")
add_overlay("[r_leg.icon_state]+o")
if(head)
add_overlay("head+o")
add_overlay("[head.icon_state]+o")
/obj/item/robot_suit/proc/check_completion()
if(src.l_arm && src.r_arm)
code/game/objects/items/stacks/sheets/sheet_types.dm
+1
View File
@@ -51,6 +51,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1), \
null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = 1, on_floor = 1), \
)
/obj/item/stack/sheet/metal