Aut'akh Limb Crate (And Others) (#6310)

This commit is contained in:
ParadoxSpace
2019-04-22 16:23:18 -06:00
committed by Werner
parent 5b83d02869
commit 56e32b30fb
11 changed files with 84 additions and 3 deletions

View File

@@ -577,7 +577,8 @@
"crowbar", "crowbar",
"screwdriver", "screwdriver",
"wrench", "wrench",
"wirecutters" "wirecutters",
"multitool"
) )
var/current_tool = 1 var/current_tool = 1
@@ -604,6 +605,9 @@
/obj/item/combitool/iscrowbar() /obj/item/combitool/iscrowbar()
return tools[current_tool] == "crowbar" return tools[current_tool] == "crowbar"
/obj/item/combitool/ismultitool()
return tools[current_tool] == "multitool"
/obj/item/combitool/proc/update_tool() /obj/item/combitool/proc/update_tool()
icon_state = "[initial(icon_state)]-[tools[current_tool]]" icon_state = "[initial(icon_state)]-[tools[current_tool]]"

View File

@@ -706,3 +706,33 @@
/obj/structure/closet/crate/extinguisher_catridges/fill() /obj/structure/closet/crate/extinguisher_catridges/fill()
for(var/a = 1 to 12) for(var/a = 1 to 12)
new /obj/item/weapon/reagent_containers/extinguisher_refill(src) new /obj/item/weapon/reagent_containers/extinguisher_refill(src)
/obj/structure/closet/crate/autakh
name = "aut'akh crate"
desc = "Contains a number of limbs and augmentations created by the Aut'akh Commune."
icon = 'icons/obj/storage.dmi'
icon_state = "autakh_crate"
icon_opened = "autakh_crateopen"
icon_closed = "autakh_crate"
/obj/structure/closet/crate/autakh/fill()
new /obj/item/organ/external/arm/right/autakh(src)
new /obj/item/organ/external/arm/right/autakh(src)
new /obj/item/organ/external/arm/autakh(src)
new /obj/item/organ/external/arm/autakh(src)
new /obj/item/organ/external/hand/autakh(src)
new /obj/item/organ/external/hand/autakh(src)
new /obj/item/organ/external/hand/right/autakh(src)
new /obj/item/organ/external/hand/right/autakh(src)
new /obj/item/organ/external/leg/autakh(src)
new /obj/item/organ/external/leg/autakh(src)
new /obj/item/organ/external/leg/right/autakh(src)
new /obj/item/organ/external/leg/right/autakh(src)
new /obj/item/organ/external/foot/autakh(src)
new /obj/item/organ/external/foot/autakh(src)
new /obj/item/organ/external/foot/right/autakh(src)
new /obj/item/organ/external/foot/right/autakh(src)
new /obj/item/organ/external/hand/right/autakh/tool(src)
new /obj/item/organ/external/hand/right/autakh/tool/mining(src)
new /obj/item/organ/external/hand/right/autakh/medical(src)
new /obj/item/organ/external/hand/right/autakh/security(src)

View File

@@ -344,7 +344,7 @@
qdel(src) qdel(src)
/obj/item/organ/external/hand/right/autakh/tool/mining /obj/item/organ/external/hand/right/autakh/tool/mining
name = "engineering grasper" name = "mining grasper"
action_button_name = "Deploy Mounted Drill" action_button_name = "Deploy Mounted Drill"
augment_type = /obj/item/weapon/pickaxe/drill/integrated augment_type = /obj/item/weapon/pickaxe/drill/integrated
@@ -357,6 +357,8 @@
/obj/item/weapon/pickaxe/drill/integrated /obj/item/weapon/pickaxe/drill/integrated
name = "integrated mining drill" name = "integrated mining drill"
icon_state = "integrateddrill"
item_state = "integrateddrill"
/obj/item/weapon/pickaxe/drill/integrated/throw_at() /obj/item/weapon/pickaxe/drill/integrated/throw_at()
usr.drop_from_inventory(src) usr.drop_from_inventory(src)

View File

@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: ParadoxSpace
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds a crate full of Aut'akh limbs to robotics."
- rscadd: "Adds a multitool to the engineering grasper, and new sprites to the mining grasper."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View File

@@ -65545,6 +65545,10 @@
/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/maintenance/medbay) /area/maintenance/medbay)
"hPs" = (
/obj/structure/closet/crate/autakh,
/turf/simulated/floor/tiled/dark,
/area/assembly/robotics)
"hRJ" = ( "hRJ" = (
/obj/machinery/alarm{ /obj/machinery/alarm{
dir = 8; dir = 8;
@@ -92779,7 +92783,7 @@ baE
bfX bfX
baE baE
biD biD
bkO hPs
biD biD
bmr bmr
bnP bnP