cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleans up some missed stuff

Browse Source
This commit is contained in:
Yoshax
2016-11-20 20:01:28 +00:00
parent af68191c24
commit f4bf14c4e6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/silicon/robot/emote.dm
View File

@@ -220,7 +220,7 @@
m_type = 1 m_type = 1
if("law") if("law")
if (istype(module,/obj/item/weapon/robot_module/security)) if (istype(module,/obj/item/weapon/robot_module/robot/security))
message = "shows its legal authorization barcode." message = "shows its legal authorization barcode."
playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0) playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0)
@@ -229,7 +229,7 @@
src << "You are not THE LAW, pal." src << "You are not THE LAW, pal."
if("halt") if("halt")
if (istype(module,/obj/item/weapon/robot_module/security)) if (istype(module,/obj/item/weapon/robot_module/robot/security))
message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"." message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
playsound(src.loc, 'sound/voice/halt.ogg', 50, 0) playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)

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

@@ -156,7 +156,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/crowbar(src) src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/extinguisher(src) src.modules += new /obj/item/weapon/extinguisher(src)
/obj/item/weapon/robot_module/standard /obj/item/weapon/robot_module/robot/standard
name = "standard robot module" name = "standard robot module"
sprites = list( "Basic" = "robot_old", sprites = list( "Basic" = "robot_old",
"Android" = "droid", "Android" = "droid",
@@ -188,7 +188,7 @@ var/global/list/robot_modules = list(
"Drone" = "drone-surgery" "Drone" = "drone-surgery"
) )
/obj/item/weapon/robot_module/medical/robot/surgeon/New() /obj/item/weapon/robot_module/robot/medical/surgeon/New()
..() ..()
src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo(src)
@@ -237,7 +237,7 @@ var/global/list/robot_modules = list(
"Drone - Chemistry" = "drone-chemistry" "Drone - Chemistry" = "drone-chemistry"
) )
/obj/item/weapon/robot_module/medical/robot/crisis/New() /obj/item/weapon/robot_module/robot/medical/crisis/New()
..() ..()
src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/borg/sight/hud/med(src)
src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/device/healthanalyzer(src)
@@ -272,7 +272,7 @@ var/global/list/robot_modules = list(
src.modules += B src.modules += B
src.modules += S src.modules += S
/obj/item/weapon/robot_module/medical/robot/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) /obj/item/weapon/robot_module/robot/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2) if(S.mode == 2)
@@ -305,7 +305,7 @@ var/global/list/robot_modules = list(
name = "construction robot module" name = "construction robot module"
no_slip = 1 no_slip = 1
/obj/item/weapon/robot_module/engineering/construction/New() /obj/item/weapon/robot_module/robot/engineering/construction/New()
..() ..()
src.modules += new /obj/item/borg/sight/meson(src) src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weapon/rcd/borg(src) src.modules += new /obj/item/weapon/rcd/borg(src)
@@ -415,7 +415,7 @@ var/global/list/robot_modules = list(
"Drone" = "drone-sec" "Drone" = "drone-sec"
) )
/obj/item/weapon/robot_module/security/general/New() /obj/item/weapon/robot_module/robot/security/general/New()
..() ..()
src.modules += new /obj/item/borg/sight/hud/sec(src) src.modules += new /obj/item/borg/sight/hud/sec(src)
src.modules += new /obj/item/weapon/handcuffs/cyborg(src) src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
@@ -537,7 +537,7 @@ var/global/list/robot_modules = list(
"Drone" = "drone-service" "Drone" = "drone-service"
) )
/obj/item/weapon/robot_module/clerical/general/New() /obj/item/weapon/robot_module/robot/clerical/general/New()
..() ..()
src.modules += new /obj/item/weapon/pen/robopen(src) src.modules += new /obj/item/weapon/pen/robopen(src)
src.modules += new /obj/item/weapon/form_printer(src) src.modules += new /obj/item/weapon/form_printer(src)
@@ -567,7 +567,7 @@ var/global/list/robot_modules = list(
) )
supported_upgrades = list(/obj/item/borg/upgrade/jetpack) supported_upgrades = list(/obj/item/borg/upgrade/jetpack)
/obj/item/weapon/robot_module/miner/New() /obj/item/weapon/robot_module/robot/miner/New()
..() ..()
src.modules += new /obj/item/borg/sight/material(src) src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/weapon/wrench(src) src.modules += new /obj/item/weapon/wrench(src)