cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Broborg and Service borg are fused into one robust little critter.

Browse Source 
Broborgs commented out.
Service borgs lose paper and spacecash wad.

Service borg gets an RSF. Rapid service fabricator, with three setting that work on simulated (normal) floors and tables:
1. Creates a wad of 10 Credits (because humans like dosh). Drains 200 each use.
2. Creates a drinking glass (to fill beer into). Drains 50 energy each use.
3. Creates a Piece of paper (for writing). Drains 10 energy each use.

The malfunction lockers use new, robust (read as slightly nerfed), 2001 a Spess Odyssey spess suits. (Due to voting results)

No 2001 jetpacks though, as they don't have item states.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1369 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-04-04 20:10:34 +00:00
parent 184ff2e4a9
commit fa416ce777
6 changed files with 127 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+6 -4
View File
@@ -46,7 +46,7 @@
if(src.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", "Brobot", "Service", "Security")
var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Miner", "Janitor","Service", "Security")
if(src.module)
return
switch(mod)
@@ -59,9 +59,11 @@
if("Service")
src.module = new /obj/item/weapon/robot_module/butler(src)
src.hands.icon_state = "service"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Butler")
var/icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Bro", "Butler")
if(icontype== "Waitress")
src.icon_state = "Service"
else if(icontype == "Bro")
src.icon_state = "Brobot"
else
src.icon_state = "Service2"
src.modtype = "Butler"
@@ -116,7 +118,7 @@
src.icon_state = "Janbot"
src.modtype = "Jan"
if("Brobot")
/* if("Brobot")
src.module = new /obj/item/weapon/robot_module/brobot(src)
src.hands.icon_state = "brobot"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Bro",)
@@ -124,7 +126,7 @@
src.icon_state = "Brobot"
else
src.icon_state = "robot"
src.modtype = "Bro"
src.modtype = "Bro"*/
src.overlays -= "eyes" //Takes off the eyes that it started with
updateicon()
code/modules/mob/living/silicon/robot/robot_modules.dm
+18 -6
View File
@@ -105,14 +105,24 @@ obj/item/weapon/robot_module/syndicate
/obj/item/weapon/robot_module/butler/New()
..()
src.modules += new /obj/item/weapon/spacecash(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
src.modules += new /obj/item/weapon/pen(src)
src.modules += new /obj/item/weapon/paper(src)
var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
M.matter = 30
src.modules += M
src.modules += new /obj/item/weapon/reagent_containers/robodropper(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/reagent_containers/food/snacks/roburgerbig(src)
src.emag.name = "Last Meal"
// src.emag = new /obj/item/weapon/reagent_containers/food/snacks/roburgerbig(src)
// src.emag.name = "Last Meal"
src.emag = new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
var/datum/reagents/R = new/datum/reagents(50)
src.emag.reagents = R
R.my_atom = src.emag
R.add_reagent("beer2", 50)
src.emag.name = "Mickey Finn's Special Brew"
/obj/item/weapon/robot_module/security/New()
@@ -135,6 +145,7 @@ obj/item/weapon/robot_module/syndicate
R.add_reagent("lube", 1000)
src.emag.name = "Lube spray"
/obj/item/weapon/robot_module/miner/New()
..()
src.modules += new /obj/item/weapon/pickaxe/radius/jackhammer(src)
@@ -143,7 +154,7 @@ obj/item/weapon/robot_module/syndicate
src.modules += new /obj/item/weapon/borg/sight/meson(src)
src.emag = new /obj/item/weapon/borg/stun(src)
/obj/item/weapon/robot_module/brobot/New()
/* /obj/item/weapon/robot_module/brobot/New()
..()
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
@@ -153,12 +164,13 @@ obj/item/weapon/robot_module/syndicate
src.emag.reagents = R
R.my_atom = src.emag
R.add_reagent("beer2", 50)
src.emag.name = "Mickey Finn's Special Brew"
src.emag.name = "Mickey Finn's Special Brew" */ //Merged with Service borg, not a death, just a transformation
obj/item/weapon/robot_module/syndicate/New()
src.modules += new /obj/item/weapon/gun/energy/crossbow(src)
src.modules += new /obj/item/weapon/card/emag(src)
/obj/item/weapon/borg/stun
name = "Electrified Arm"
icon = 'decals.dmi'