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 #7034 from atlantiscze/2020_04_23_RobotXenoarch

Browse Source 
Adds basic xenoarch & exploration equipment to research robot module
This commit is contained in:
Atermonera
2020-04-25 12:58:01 -07:00
committed by VirgoBot
parent 085c822b02
commit 629b2711d1
2 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@ var/global/list/robot_modules = list(
"Security" = /obj/item/weapon/robot_module/robot/security/general,
"Combat" = /obj/item/weapon/robot_module/robot/security/combat,
"Engineering" = /obj/item/weapon/robot_module/robot/engineering/general,
// "Construction" = /obj/item/weapon/robot_module/robot/engineering/construction,
"Janitor" = /obj/item/weapon/robot_module/robot/janitor
)
@@ -381,53 +380,6 @@ var/global/list/robot_modules = list(
"Pyralis" = "Glitterfly-Engineering"
)
/obj/item/weapon/robot_module/robot/engineering/construction
name = "construction robot module"
no_slip = 1
/* Merged back into engineering (Hell, it's about time.)
/obj/item/weapon/robot_module/robot/engineering/construction/New()
..()
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weapon/rcd/borg(src)
src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src)
src.modules += new /obj/item/weapon/tool/wrench/cyborg(src)
src.modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src)
src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/device/floor_painter(src)
src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
src.modules += new /obj/item/device/geiger(src)
var/datum/matter_synth/metal = new /datum/matter_synth/metal()
var/datum/matter_synth/plasteel = new /datum/matter_synth/plasteel()
var/datum/matter_synth/glass = new /datum/matter_synth/glass()
synths += metal
synths += plasteel
synths += glass
var/obj/item/stack/material/cyborg/steel/M = new (src)
M.synths = list(metal)
src.modules += M
var/obj/item/stack/rods/cyborg/R = new /obj/item/stack/rods/cyborg(src)
R.synths = list(metal)
src.modules += R
var/obj/item/stack/tile/floor/cyborg/F = new /obj/item/stack/tile/floor/cyborg(src)
F.synths = list(metal)
src.modules += F
var/obj/item/stack/material/cyborg/plasteel/S = new (src)
S.synths = list(plasteel)
src.modules += S
var/obj/item/stack/material/cyborg/glass/reinforced/RG = new (src)
RG.synths = list(metal, glass)
src.modules += RG
*/
/obj/item/weapon/robot_module/robot/engineering/general/New()
..()
src.modules += new /obj/item/borg/sight/meson(src)
@@ -794,6 +746,10 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/shockpaddles/robot/jumper(src)
src.modules += new /obj/item/weapon/melee/baton/slime/robot(src)
src.modules += new /obj/item/weapon/gun/energy/taser/xeno/robot(src)
src.modules += new /obj/item/device/xenoarch_multi_tool(src)
src.modules += new /obj/item/weapon/pickaxe/excavationdrill(src)
src.modules += new /obj/item/device/cataloguer(src)
src.emag = new /obj/item/weapon/hand_tele(src)
var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000)

6
html/changelogs/atlantiscze-xenoarch.yml Normal file
View File

@@ -0,0 +1,6 @@
author: atlantiscze
delete-after: True
changes:
- rscadd: "Research robot module now has basic exploration and xenoarchaeology tools."