diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index d7bc13cf49..b0301b3ec6 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1134,6 +1134,9 @@ Total SMES charging rate should not exceed total power generation rate, or an ov m_amt = 700 var/rigged = 0 // true if rigged to explode +/obj/item/weapon/cell/robotcrate + maxcharge = 10000 + /obj/item/weapon/camera_bug/attack_self(mob/usr as mob) var/list/cameras = new/list() diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index e85f17d85c..d184746ee2 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -263,16 +263,29 @@ var/supply_shuttle_points = 50 containername = "Clown Gear" */ -/datum/supply_packs/robot - name = "Robotics Crate" - contains = list("/obj/machinery/bot/secbot", - "/obj/machinery/bot/floorbot", - "/obj/machinery/bot/cleanbot", - "/obj/machinery/bot/medbot", - "/obj/machinery/bot/mulebot") +/datum/supply_packs/mule + name = "MULEbot Crate" + contains = list("/obj/machinery/bot/mulebot") cost = 20 containertype = "/obj/crate" - containername = "Robotics Crate" + containername = "MULEbot Crate" + +/datum/supply_packs/robotics + name = "Robotics Assembly Crate" + contains = list("/obj/item/device/prox_sensor", + "/obj/item/device/prox_sensor", + "/obj/item/device/prox_sensor", + "/obj/item/weapon/storage/toolbox/electrical", + "/obj/item/device/flash", + "/obj/item/device/flash", + "/obj/item/device/flash", + "/obj/item/device/flash", + "/obj/item/weapon/cell/robotcrate", + "/obj/item/weapon/cell/robotcrate") + cost = 10 + containertype = /obj/crate/secure/gear + containername = "Robotics Assembly" + access = access_robotics //SUPPLY PACKS diff --git a/icons/changelog.html b/icons/changelog.html index 70da90a404..adfbea64b8 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -26,7 +26,7 @@
@@ -41,6 +41,17 @@
Visit our IRC channel, #tgstation13 on irc.rizon.net