cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5858 from Zuhayr/master

Browse Source 
Fixes
This commit is contained in:
Mloc
2014-08-01 15:02:23 +01:00
parent a6e483d48d afc40e7f44
commit 6133083ca6
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -284,10 +284,13 @@
/mob/living/silicon/robot/proc/updatename(var/prefix as text)
if(prefix)
modtype = prefix
if(istype(mmi, /obj/item/device/mmi/posibrain))
braintype = "Android"
if(mmi)
if(istype(mmi, /obj/item/device/mmi/posibrain))
braintype = "Android"
else
braintype = "Cyborg"
else
braintype = "Cyborg"
braintype = "Robot"
var/changed_name = ""
if(custom_name)

10
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -398,14 +398,14 @@
/obj/item/weapon/robot_module/drone
name = "drone module"
stacktypes = list(
/obj/item/stack/sheet/wood/cyborg = 1,
/obj/item/stack/sheet/mineral/plastic/cyborg = 1,
/obj/item/stack/sheet/rglass/cyborg = 5,
/obj/item/stack/sheet/wood = 1,
/obj/item/stack/sheet/mineral/plastic = 1,
/obj/item/stack/sheet/rglass = 5,
/obj/item/stack/tile/wood = 5,
/obj/item/stack/rods = 15,
/obj/item/stack/tile/plasteel = 15,
/obj/item/stack/sheet/metal/cyborg = 20,
/obj/item/stack/sheet/glass/cyborg = 20,
/obj/item/stack/sheet/metal = 20,
/obj/item/stack/sheet/glass = 20,
/obj/item/weapon/cable_coil = 30
)