cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Welding mask change reverted.

Browse Source 
Green lab coat can now be spawned.
Tweak to several sprites, nothing major.
Default sprite added to masks, so that some gimmick items may be spawned now.
Tea has a funnier name and description. Vending machine changed to "Hot" from "Warm" to better reflect contents.
Service Cyborgs can be picked! Shaker, dropper, tray, pen+paper for note/order taking and DOSH to show their class off. When emagged, Colonel Butlertron did it in Atmosia with the Energy Sword. Possibly bugged, must investigate further. (SoS authorized some live testing!)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1197 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
bizarre.babel@gmail.com
2011-03-17 09:18:01 +00:00
parent f9460f5c3c
commit 3b15b2d93c
11 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,8 @@
/mob/living/silicon/robot/proc/pick_module()
if(src.module)
return
//var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Brobot")
var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Janitor", "Brobot", "Security")
//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", "Janitor", "Brobot", "Service", "Security")
if(src.module)
return
switch(mod)
@@ -48,6 +48,13 @@
src.hands.icon_state = "standard"
src.icon_state = "robot"
src.modtype = "Stand"
if("Service")
src.module = new /obj/item/weapon/robot_module/butler(src)
src.hands.icon_state = "service"
src.icon_state = "Service"
src.modtype = "Butler"
/*
if("Medical")
src.module = new /obj/item/weapon/robot_module/medical(src)

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

@@ -34,6 +34,9 @@
/obj/item/weapon/robot_module/brobot
name = "brobot robot module"
/obj/item/weapon/robot_module/butler
name = "service robot module"
/obj/item/weapon/robot_module/New()//Shit all the mods have
src.modules += new /obj/item/device/flash(src)
src.emag = new /obj/item/toy/sword(src)
@@ -92,6 +95,19 @@
src.modules += new /obj/item/weapon/circular_saw(src)
*/
/obj/item/weapon/robot_module/butler/New()
..()
src.modules += new /obj/item/weapon/spacecash(src)
src.modules += new /obj/item/weapon/pen(src)
src.modules += new /obj/item/weapon/paper(src)
src.modules += new /obj/item/weapon/reagent_containers/dropper(src)
src.modules += new /obj/item/weapon/tray(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
src.emag = new /obj/item/weapon/sword(src)
src.emag.name = "Helper's Little Helper"
/obj/item/weapon/robot_module/security/New()
..()
src.modules += new /obj/item/weapon/baton(src)