From 0842d9b33d53b5ca2939e796ac712b7cdce2764d Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Sun, 29 Aug 2010 04:17:30 +0000 Subject: [PATCH] Removed robotics crate, added mulebot crate (1 mulebot) and robotics assembly crate (4x flash, 3x prox sensor, 2x 10k power cell (NEW: /obj/item/weapon/cell/robotcrate), 1x electrical toolbox). Updated changelog. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@13 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 3 +++ code/game/supplyshuttle.dm | 29 +++++++++++++++++++++-------- icons/changelog.html | 14 +++++++++++++- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index d7bc13cf493..b0301b3ec6c 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 e85f17d85c0..d184746ee20 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 70da90a404c..adfbea64b8a 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -26,7 +26,7 @@

We have a forum! http://tgstation13.servehttp.com

-

Google Code project page: http://tgstation13.googlecode.com/

+

Google Code project page: http://tgstation13.googlecode.com/

Goon Station 13
Goon Station 13 Creative Commons License
@@ -41,6 +41,17 @@

Visit our IRC channel, #tgstation13 on irc.rizon.net

Changelog

+

Sunday, August 29, 05:09

+ +

Thursday, August 26, 21:07

Friday, August 06, 20:32