cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8283 from Kyep/no_peace

Browse Source 
Removes peacekeepers
This commit is contained in:
Crazy Lemon
2017-12-05 15:12:56 -08:00
committed by GitHub
parent 1fad05771d 1c3b1957cb
commit c02a561a5a
11 changed files with 2 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+2 -11
View File
@@ -274,11 +274,7 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/proc/pick_module()
if(module)
return
var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service")
if(!config.forbid_secborg)
modules += "Security"
if(!config.forbid_peaceborg)
modules += "Peacekeeper"
var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
if(islist(force_modules) && force_modules.len)
modules = force_modules.Copy()
if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
@@ -354,11 +350,6 @@ var/list/robot_verbs_default = list(
module_sprites["Noble-SEC"] = "Noble-SEC"
status_flags &= ~CANPUSH
if("Peacekeeper")
module = new /obj/item/weapon/robot_module/peacekeeper(src)
module_sprites["Peacekeeper"] = "peace"
status_flags &= ~CANPUSH
if("Engineering")
module = new /obj/item/weapon/robot_module/engineering(src)
module.channels = list("Engineering" = 1)
@@ -411,7 +402,7 @@ var/list/robot_verbs_default = list(
feedback_inc("cyborg_[lowertext(modtype)]",1)
rename_character(real_name, get_default_name())
if(modtype == "Medical" || modtype == "Security" || modtype == "Combat" || modtype == "Peacekeeper" || modtype == "Nations")
if(modtype == "Medical" || modtype == "Security" || modtype == "Combat" || modtype == "Nations")
status_flags &= ~CANPUSH
choose_icon(6,module_sprites)
code/modules/mob/living/silicon/robot/robot_modules.dm
-16
View File
@@ -229,22 +229,6 @@
fix_modules()
/obj/item/weapon/robot_module/peacekeeper
name = "peacekeeping robot module"
module_type = "Standard"
/obj/item/weapon/robot_module/peacekeeper/New()
..()
modules += new /obj/item/weapon/cookiesynth(src)
modules += new /obj/item/device/harmalarm(src)
modules += new /obj/item/weapon/reagent_containers/borghypo/peace(src)
modules += new /obj/item/taperoll/police(src)
modules += new /obj/item/borg/cyborghug/peacekeeper(src)
modules += new /obj/item/weapon/extinguisher(src)
emag = new /obj/item/weapon/reagent_containers/borghypo/peace/hacked(src)
fix_modules()
/obj/item/weapon/robot_module/janitor
name = "janitorial robot module"
module_type = "Janitor"