cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

These updates has been committed for Petethegoat, Trubble_Bass and Derp__. Please yell at them and not be if anything is broken.

Browse Source 
--------------------------------------------
Pete

Changelog:

Appendicitis!
It's a new disease which must be cured surgically- instructions are available on the wiki:
http://tgstation13.pretentiousfool.com/wiki/index.php/Surgery

Tell Petethegoat either on the forums or on IRC if you find any problems.

------------------------------------------------

Trubble has fixed a bug with the hat crates. They can now be correctly opened.

-----------------------------------------------

Derp has added the Medborg. YES!!!
Service borg has also recieved some minor tweaks. It can now use the Booze-o-mat. it can also extrude enzymes.

------------------------------------------------

Report any problems to them via Forums or IRC. Thankyou.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1866 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
firecage@hotmail.com
2011-07-16 20:47:46 +00:00
parent a960bcabc0
commit 94d5be982c
21 changed files with 621 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -61,7 +61,7 @@
if(module)
return
//var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Service", "Brobot")
var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Miner", "Janitor","Service", "Security")
var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service", "Security")
if(module)
return
switch(mod)
@@ -91,13 +91,18 @@
icon_state = "Miner"
modtype = "Miner"
/*
if("Medical")
module = new /obj/item/weapon/robot_module/medical(src)
hands.icon_state = "medical"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Kent")
// icon_state = "MedBot"
if(icontype == "Kent")
icon_state = "toiletbot"
else
icon_state = "robot"
modtype = "Med"
*/
if("Security")
module = new /obj/item/weapon/robot_module/security(src)
hands.icon_state = "security"

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

@@ -21,10 +21,10 @@
/obj/item/weapon/robot_module/standard
name = "standard robot module"
/*
/obj/item/weapon/robot_module/medical
name = "medical robot module"
*/
/obj/item/weapon/robot_module/engineering
name = "engineering robot module"
@@ -109,21 +109,41 @@ obj/item/weapon/robot_module/syndicate
src.modules += O
O:amount = 1
/*
/obj/item/weapon/robot_module/medical/respawn_consumable(var/mob/living/silicon/robot/R)
var/list/what = list (
/obj/item/weapon/reagent_containers/pill/kelotane,
/obj/item/weapon/reagent_containers/pill/dexalin,
/obj/item/weapon/reagent_containers/pill/cyanide,
)
for (var/T in what)
if (!(locate(T) in src.modules))
src.modules -= null
var/O = new T(src)
src.modules += O
O:amount = 1
/obj/item/weapon/robot_module/medical/New()
..()
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/stack/medical/ointment/medbot(src)
src.modules += new /obj/item/stack/medical/bruise_pack/medbot(src)
src.modules += new /obj/item/weapon/reagent_containers/syringe/robot(src)
src.modules += new /obj/item/weapon/scalpel(src)
src.modules += new /obj/item/weapon/circular_saw(src)
*/
src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
src.modules += new /obj/item/weapon/reagent_containers/pill/kelotane(src)
src.modules += new /obj/item/weapon/reagent_containers/pill/dexalin(src)
//commented out due to law 1
//src.modules += new /obj/item/weapon/scalpel(src)
//src.modules += new /obj/item/weapon/circular_saw(src)
src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src)
src.emag = new /obj/item/weapon/reagent_containers/pill/cyanide(src)
/obj/item/weapon/robot_module/butler/New()
..()
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
src.modules += new /obj/item/weapon/pen(src)
var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)