Skip to content

Commit

Permalink
[MIRROR] [NO-GBP] Fixes my borg moduling fuckup [MDB IGNORE] (#2934)
Browse files Browse the repository at this point in the history
* [NO-GBP] Fixes my borg moduling fuckup (#83785)

## About The Pull Request

fixes #83773

## Why It's Good For The Game

I missed a few minor nitpicks in my PR, and did one major one that may
have ended up in accidental nullspacing of some things.


![image](https://github.com/tgstation/tgstation/assets/49160555/563702f7-1aa3-420b-b7e8-a1fb4e3f1e00)

![image](https://github.com/tgstation/tgstation/assets/49160555/0ca5f38d-c55c-4b22-871c-4a5cb40aa6a7)

## Changelog

:cl:
fix: Fixes several service and item-handling borg modules not
functioning
/:cl:

* [NO-GBP] Fixes my borg moduling fuckup

---------

Co-authored-by: Waterpig <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Jun 9, 2024
1 parent 8bc49f4 commit d5dfa0d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions code/game/objects/items/robot/robot_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
// Handles adding items with the module
/obj/item/borg/upgrade/proc/install_items(mob/living/silicon/robot/borg, mob/living/user = usr, list/items)
for(var/item_to_add in items)
var/obj/item/module_item = new item_to_add(borg.model.modules)
var/obj/item/module_item = new item_to_add(borg.model)
borg.model.basic_modules += module_item
borg.model.add_module(module_item, FALSE, TRUE)
return TRUE
Expand Down Expand Up @@ -763,9 +763,11 @@
desc = "An upgrade to the service model cyborg, to help provide mobile service."
icon_state = "cyborg_upgrade3"
require_model = TRUE
model_type = list(/obj/item/rolling_table_dock)
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE

items_to_add = list(/obj/item/rolling_table_dock)

/obj/item/borg/upgrade/service_cookbook
name = "Service Cyborg Cookbook"
desc = "An upgrade to the service model cyborg, that lets them create more foods."
Expand All @@ -774,7 +776,7 @@
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE

model_type = list(/obj/item/borg/cookbook)
items_to_add = list(/obj/item/borg/cookbook)

///This isn't an upgrade or part of the same path, but I'm gonna just stick it here because it's a tool used on cyborgs.
//A reusable tool that can bring borgs back to life. They gotta be repaired first, though.
Expand Down

0 comments on commit d5dfa0d

Please sign in to comment.