Skip to content

Commit fc0e5a8

Browse files
authored
Re-adds the standard cyborg! (#333)
1 parent edd31b9 commit fc0e5a8

File tree

4 files changed

+31
-2
lines changed

4 files changed

+31
-2
lines changed

code/game/objects/items/robot/robot_upgrades.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@
679679
name = "borg model picker (Standard)"
680680
desc = "Allows you to to turn a cyborg into a standard cyborg."
681681
icon_state = "cyborg_upgrade3"
682-
var/obj/item/robot_model/new_model = null
682+
var/obj/item/robot_model/new_model = /obj/item/robot_model/standard
683683

684684
/obj/item/borg/upgrade/transform/action(mob/living/silicon/robot/R, user = usr)
685685
. = ..()

code/modules/mob/living/silicon/robot/robot.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@
138138
to_chat(src,span_userdanger("ERROR: Model installer reply timeout. Please check internal connections."))
139139
return
140140

141-
var/list/model_list = list("Engineering" = /obj/item/robot_model/engineering, \
141+
var/list/model_list = list("Standard" = /obj/item/robot_model/standard, \
142+
"Engineering" = /obj/item/robot_model/engineering, \
142143
"Medical" = /obj/item/robot_model/medical, \
143144
"Miner" = /obj/item/robot_model/miner, \
144145
"Janitor" = /obj/item/robot_model/janitor, \

code/modules/mob/living/silicon/robot/robot_defines.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@
160160
. = ..()
161161
model.transform_to(set_model)
162162

163+
// --------------------- Standard
164+
/mob/living/silicon/robot/model/standard
165+
set_model = /obj/item/robot_model/standard
166+
163167
// --------------------- Clown
164168
/mob/living/silicon/robot/model/clown
165169
set_model = /obj/item/robot_model/clown

code/modules/mob/living/silicon/robot/robot_modules.dm

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,30 @@
198198
return TRUE
199199

200200
// ------------------------------------------ Setting base model modules
201+
// --------------------- Standard
202+
/obj/item/robot_model/standard
203+
name = "Standard"
204+
basic_modules = list(
205+
/obj/item/assembly/flash/cyborg,
206+
/obj/item/reagent_containers/borghypo/epi,
207+
/obj/item/healthanalyzer,
208+
/obj/item/weldingtool/largetank/cyborg,
209+
/obj/item/wrench/cyborg,
210+
/obj/item/crowbar/cyborg,
211+
/obj/item/stack/sheet/iron,
212+
/obj/item/stack/rods/cyborg,
213+
/obj/item/stack/tile/iron/base/cyborg,,
214+
/obj/item/extinguisher,
215+
/obj/item/pickaxe,
216+
/obj/item/t_scanner/adv_mining_scanner,
217+
/obj/item/soap/nanotrasen,
218+
/obj/item/borg/cyborghug)
219+
emag_modules = list(
220+
/obj/item/melee/transforming/energy/sword/cyborg,
221+
/obj/item/restraints/handcuffs/cable/zipties) //Putting this here since no one likes validhunting borgs.
222+
model_select_icon = "standard"
223+
hat_offset = -3
224+
201225
// --------------------- Clown
202226
/obj/item/robot_model/clown
203227
name = "Clown"

0 commit comments

Comments
 (0)