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

Merge pull request #2 from ParadiseSS13/master

Browse Source 
updating~
This commit is contained in:
Terilia
2017-12-06 01:08:13 +00:00
committed by GitHub
parent fd4fc836b1 90aad7d74d
commit bd20397934
22 changed files with 55 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
-8
View File
@@ -50,8 +50,6 @@
var/humans_need_surnames = 0
var/allow_random_events = 0 // enables random events mid-round when set to 1
var/allow_ai = 1 // allow ai job
var/forbid_secborg = 0 // disallow secborg module to be chosen.
var/forbid_peaceborg = 0 // disallow peacekeeper module to be chosen.
var/hostedby = null
var/respawn = 0
var/guest_jobban = 1
@@ -337,12 +335,6 @@
if("allow_ai")
config.allow_ai = 1
if("disable_secborg")
forbid_secborg = 1
if("disable_peaceborg")
forbid_peaceborg = 1
// if("authentication")
// config.enable_authentication = 1
code/game/jobs/job/job.dm
+14
View File
@@ -52,6 +52,8 @@
var/exp_requirements = 0
var/exp_type = ""
var/disabilities_allowed = 1
var/admin_only = 0
var/spawn_ert = 0
@@ -110,6 +112,18 @@
return max(0, minimal_player_age - C.player_age)
/datum/job/proc/barred_by_disability(client/C)
if(!C)
return 0
if(disabilities_allowed)
return 0
var/list/prohibited_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_BLIND, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_SCRAMBLED, DISABILITY_FLAG_EPILEPTIC, DISABILITY_FLAG_TOURETTES, DISABILITY_FLAG_NEARSIGHTED, DISABILITY_FLAG_DIZZY)
for(var/i = 1, i < prohibited_disabilities.len, i++)
var/this_disability = prohibited_disabilities[i]
if(C.prefs.disabilities & this_disability)
return 1
return 0
/datum/job/proc/is_position_available()
return (current_positions < total_positions) || (total_positions == -1)
code/game/jobs/job/science.dm
-1
View File
@@ -20,7 +20,6 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
// All science-y guys get bonuses for maxing out their tech.
required_objectives = list(
/datum/job_objective/further_research
code/game/jobs/job/security.dm
+1 -10
View File
@@ -20,6 +20,7 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/hos
/datum/outfit/job/hos
@@ -172,7 +173,6 @@
/datum/outfit/job/officer
name = "Security Officer"
jobtype = /datum/job/officer
uniform = /obj/item/clothing/under/rank/security
suit = /obj/item/clothing/suit/armor/vest/security
gloves = /obj/item/clothing/gloves/color/black
@@ -186,9 +186,7 @@
backpack_contents = list(
/obj/item/weapon/restraints/handcuffs = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
@@ -212,7 +210,6 @@
/datum/outfit/job/brigdoc
name = "Brig Physician"
jobtype = /datum/job/brigdoc
uniform = /obj/item/clothing/under/rank/security/brigphys
suit = /obj/item/clothing/suit/storage/fr_jacket
shoes = /obj/item/clothing/shoes/white
@@ -222,15 +219,12 @@
suit_store = /obj/item/device/flashlight/pen
l_hand = /obj/item/weapon/storage/firstaid/adv
pda = /obj/item/device/pda/medical
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel_med
dufflebag = /obj/item/weapon/storage/backpack/duffel/medical
/datum/job/pilot
title = "Security Pod Pilot"
flag = PILOT
@@ -249,7 +243,6 @@
/datum/outfit/job/pilot
name = "Security Pod Pilot"
jobtype = /datum/job/pilot
uniform = /obj/item/clothing/under/rank/security/pod_pilot
suit = /obj/item/clothing/suit/jacket/pilot
gloves = /obj/item/clothing/gloves/color/black
@@ -262,9 +255,7 @@
backpack_contents = list(
/obj/item/weapon/restraints/handcuffs = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
code/game/jobs/job/supervisor.dm
+1 -19
View File
@@ -15,6 +15,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
minimal_player_age = 30
exp_requirements = 1200
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/captain
/datum/job/captain/get_access()
@@ -28,7 +29,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/datum/outfit/job/captain
name = "Captain"
jobtype = /datum/job/captain
uniform = /obj/item/clothing/under/rank/captain
suit = /obj/item/clothing/suit/armor/vest/capcarapace
shoes = /obj/item/clothing/shoes/brown
@@ -41,9 +41,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/obj/item/weapon/storage/box/ids = 1,
/obj/item/weapon/melee/classic_baton/telescopic = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/captain
satchel = /obj/item/weapon/storage/backpack/satchel_cap
dufflebag = /obj/item/weapon/storage/backpack/duffel/captain
@@ -84,13 +82,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_mineral_storeroom)
outfit = /datum/outfit/job/hop
/datum/outfit/job/hop
name = "Head of Personnel"
jobtype = /datum/job/hop
uniform = /obj/item/clothing/under/rank/head_of_personnel
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/hopcap
@@ -130,13 +126,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_ntrep)
outfit = /datum/outfit/job/nanotrasenrep
/datum/outfit/job/nanotrasenrep
name = "Nanotrasen Representative"
jobtype = /datum/job/nanotrasenrep
uniform = /obj/item/clothing/under/rank/ntrep
suit = /obj/item/clothing/suit/storage/ntrep
shoes = /obj/item/clothing/shoes/centcom
@@ -147,7 +141,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
backpack_contents = list(
/obj/item/weapon/melee/classic_baton/ntcane = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
@@ -172,13 +165,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_blueshield)
minimal_access = list(access_forensics_lockers, access_sec_doors, access_medical, access_construction, access_engine, access_maint_tunnels, access_research,
access_RC_announce, access_keycard_auth, access_heads, access_blueshield, access_weapons)
outfit = /datum/outfit/job/blueshield
/datum/outfit/job/blueshield
name = "Blueshield"
jobtype = /datum/job/blueshield
uniform = /obj/item/clothing/under/rank/blueshield
suit = /obj/item/clothing/suit/armor/vest/blueshield
gloves = /obj/item/clothing/gloves/combat
@@ -191,9 +182,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/obj/item/weapon/storage/box/deathimp = 1,
/obj/item/weapon/gun/energy/gun/blueshield = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
@@ -218,13 +207,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_magistrate)
minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_lawyer, access_magistrate, access_heads)
outfit = /datum/outfit/job/judge
/datum/outfit/job/judge
name = "Magistrate"
jobtype = /datum/job/judge
uniform = /obj/item/clothing/under/suit_jacket/really_black
suit = /obj/item/clothing/suit/judgerobe
gloves = /obj/item/clothing/gloves/color/white
@@ -238,9 +225,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
backpack_contents = list(
/obj/item/weapon/melee/classic_baton/telescopic = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
@@ -268,7 +253,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/datum/outfit/job/lawyer
name = "Internal Affairs Agent"
jobtype = /datum/job/lawyer
uniform = /obj/item/clothing/under/rank/internalaffairs
suit = /obj/item/clothing/suit/storage/internalaffairs
shoes = /obj/item/clothing/shoes/brown
@@ -279,8 +263,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
r_pocket = /obj/item/device/flash
l_hand = /obj/item/weapon/storage/briefcase
pda = /obj/item/device/pda/lawyer
implants = list(/obj/item/weapon/implant/mindshield)
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
code/game/jobs/job_controller.dm
+18 -1
View File
@@ -70,6 +70,8 @@ var/global/datum/controller/occupations/job_master
return 0
if(job.available_in_playtime(player.client))
return 0
if(job.barred_by_disability(player.client))
return 0
if(!is_job_whitelisted(player, rank))
return 0
@@ -120,6 +122,9 @@ var/global/datum/controller/occupations/job_master
if(job.available_in_playtime(player.client))
Debug("FOC player not enough playtime, Player: [player]")
continue
if(job.barred_by_disability(player.client))
Debug("FOC player has disability rendering them ineligible for job, Player: [player]")
continue
if(flag && !(flag in player.client.prefs.be_special))
Debug("FOC flag failed, Player: [player], Flag: [flag], ")
continue
@@ -161,6 +166,10 @@ var/global/datum/controller/occupations/job_master
Debug("GRJ player not enough playtime, Player: [player]")
continue
if(job.barred_by_disability(player.client))
Debug("GRJ player has disability rendering them ineligible for job, Player: [player]")
continue
if(player.mind && job.title in player.mind.restricted_roles)
Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
@@ -356,6 +365,10 @@ var/global/datum/controller/occupations/job_master
Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
continue
if(job.barred_by_disability(player.client))
Debug("DO player has disability rendering them ineligible for job, Player: [player], Job:[job.title]")
continue
if(player.mind && job.title in player.mind.restricted_roles)
Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue
@@ -544,6 +557,7 @@ var/global/datum/controller/occupations/job_master
var/level4 = 0 //never
var/level5 = 0 //banned
var/level6 = 0 //account too young
var/level7 = 0 //has disability rendering them ineligible
for(var/mob/new_player/player in player_list)
if(!(player.ready && player.mind && !player.mind.assigned_role))
continue //This player is not ready
@@ -556,6 +570,9 @@ var/global/datum/controller/occupations/job_master
if(job.available_in_playtime(player.client))
level6++
continue
if(job.barred_by_disability(player.client))
level7++
continue
if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
level1++
else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
@@ -564,7 +581,7 @@ var/global/datum/controller/occupations/job_master
level3++
else level4++ //not selected
tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-"
tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|DISABILITY=[level7]|-"
feedback_add_details("job_preferences",tmp_str)
code/game/objects/items/robot/robot_items.dm
-195
View File
@@ -36,198 +36,3 @@
name = "Overdrive"
icon = 'icons/obj/decals.dmi'
icon_state = "shock"
#define BORG_HUG 0
#define BORG_HUG_SUPER 1
#define BORG_HUG_SHOCK 2
#define BORG_HUG_CRUSH 3
/obj/item/borg/cyborghug
name = "Hugging Module"
icon_state = "hugmodule"
desc = "For when a someone really needs a hug."
var/mode = BORG_HUG //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
var/ccooldown = 0
var/scooldown = 0
var/shockallowed = FALSE//Can it be a stunarm when emagged. Only PK borgs get this by default.
var/boop = FALSE
/obj/item/borg/cyborghug/attack_self(mob/living/user)
if(isrobot(user))
var/mob/living/silicon/robot/P = user
if(P.emagged && shockallowed)
if(mode < BORG_HUG_CRUSH)
mode++
else
mode = BORG_HUG
else if(mode < BORG_HUG_SUPER)
mode++
else
mode = BORG_HUG
switch(mode)
if(BORG_HUG)
to_chat(user, "<span class='notice'>Power reset. Hugs!</span>")
if(BORG_HUG_SUPER)
to_chat(user, "<span class='notice'>Power increased!</span>")
if(BORG_HUG_SHOCK)
to_chat(user, "<span class='warning'>BZZT. Electrifying arms...</span>")
if(BORG_HUG_CRUSH)
to_chat(user, "<span class='warning'>ERROR: ARM ACTUATORS OVERLOADED.</span>")
/obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user)
if(M == user)
return
switch(mode)
if(BORG_HUG)
if(M.health >= config.health_threshold_crit)
if(user.zone_sel.selecting == "head")
user.visible_message("<span class='notice'>[user] playfully boops [M] on the head!</span>", \
"<span class='notice'>You playfully boop [M] on the head!</span>")
user.do_attack_animation(M)
playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
else if(ishuman(M))
if(M.lying)
user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
"<span class='notice'>You shake [M] trying to get \him up!</span>")
else
user.visible_message("<span class='notice'>[user] hugs [M] to make \him feel better!</span>", \
"<span class='notice'>You hug [M] to make \him feel better!</span>")
if(M.resting)
M.resting = FALSE
M.update_canmove()
else
user.visible_message("<span class='notice'>[user] pets [M]!</span>", \
"<span class='notice'>You pet [M]!</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(BORG_HUG_SUPER)
if(M.health >= config.health_threshold_crit)
if(ishuman(M))
if(M.lying)
user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
"<span class='notice'>You shake [M] trying to get \him up!</span>")
else if(user.zone_sel.selecting == "head")
user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
"<span class='warning'>You bop [M] on the head!</span>")
user.do_attack_animation(M)
else
user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
"<span class='warning'>You hug [M] firmly to make \him feel better! [M] looks uncomfortable...</span>")
if(M.resting)
M.resting = FALSE
M.update_canmove()
else
user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
"<span class='warning'>You bop [M] on the head!</span>")
playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
if(BORG_HUG_SHOCK)
if(!scooldown)
if(M.health >= config.health_threshold_crit)
if(ishuman(M))
M.electrocute_act(5, "[user]", safety = 1)
user.visible_message("<span class='userdanger'>[user] electrocutes [M] with their touch!</span>", \
"<span class='danger'>You electrocute [M] with your touch!</span>")
M.update_canmove()
else
if(!isrobot(M))
M.adjustFireLoss(10)
user.visible_message("<span class='userdanger'>[user] shocks [M]!</span>", \
"<span class='danger'>You shock [M]!</span>")
else
user.visible_message("<span class='userdanger'>[user] shocks [M]. It does not seem to have an effect</span>", \
"<span class='danger'>You shock [M] to no effect.</span>")
playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1)
user.cell.charge -= 500
scooldown = TRUE
spawn(20)
scooldown = FALSE
if(BORG_HUG_CRUSH)
if(!ccooldown)
if(M.health >= config.health_threshold_crit)
if(ishuman(M))
user.visible_message("<span class='userdanger'>[user] crushes [M] in their grip!</span>", \
"<span class='danger'>You crush [M] in your grip!</span>")
else
user.visible_message("<span class='userdanger'>[user] crushes [M]!</span>", \
"<span class='danger'>You crush [M]!</span>")
playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1)
M.adjustBruteLoss(15)
user.cell.charge -= 300
ccooldown = TRUE
spawn(10)
ccooldown = FALSE
#undef BORG_HUG
#undef BORG_HUG_SUPER
#undef BORG_HUG_SHOCK
#undef BORG_HUG_CRUSH
/obj/item/borg/cyborghug/peacekeeper
shockallowed = TRUE
/obj/item/device/harmalarm
name = "Sonic Harm Prevention Tool"
desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
icon_state = "megaphone"
var/cooldown = 0
var/emagged = FALSE
/obj/item/device/harmalarm/emag_act(mob/user)
emagged = !emagged
if(emagged)
to_chat(user, "<span class='warning'>You short out the safeties on the [src]!</span>")
else
to_chat(user, "<span class='warning'>You reset the safeties on the [src]!</span>")
/obj/item/device/harmalarm/attack_self(mob/user)
var/safety = !emagged
if(cooldown > world.time)
to_chat(user, "<span class='warning'>The device is still recharging!</span>")
return
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(R.cell.charge < 1200)
to_chat(user, "<span class='warning'>You don't have enough charge to do this!</span>")
return
R.cell.charge -= 1000
if(R.emagged)
safety = FALSE
if(safety)
user.visible_message("<span class='danger'>[user] blares out a near-deafening siren from its speakers!</span>")
for(var/mob/living/carbon/M in get_mobs_in_view(9, user))
if(!M.check_ear_prot())
M.AdjustConfused(6)
to_chat(M, "<span class='userdanger'>The siren pierces your hearing!</span>")
audible_message("<span class='biggerdanger'>HUMAN HARM</span>")
playsound(get_turf(src), 'sound/AI/harmalarm.ogg', 70, 3)
cooldown = world.time + 200
log_game("[key_name(user)] used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(R.connected_ai)
to_chat(R.connected_ai, "<br><span class='notice'>NOTICE - Peacekeeping 'HARM ALARM' used by: [user]</span><br>")
return
user.audible_message("<span class='biggerdanger'>BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT</span>")
for(var/mob/living/carbon/human/H in get_mobs_in_view(9, user))
if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf)
continue
var/earsafety = FALSE
if(H.check_ear_prot())
earsafety = TRUE
if(earsafety)
H.AdjustConfused(5)
H.AdjustStuttering(10)
H.Jitter(10)
else
H.Weaken(2)
H.AdjustConfused(10)
H.AdjustStuttering(15)
H.Jitter(25)
playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
cooldown = world.time + 600
log_game("[key_name(user)] used an emagged Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
code/game/objects/items/weapons/RSF.dm
-73
View File
@@ -84,76 +84,3 @@ RSF
playsound(loc, 'sound/machines/click.ogg', 10, 1)
var/type_path = configured_items[mode][3]
new type_path(spawn_location)
/obj/item/weapon/cookiesynth
name = "\improper Cookie Synthesizer"
desc = "A self-recharging device used to rapidly deploy cookies."
icon = 'icons/obj/tools.dmi'
icon_state = "rcd"
var/matter = 10
var/toxin = FALSE
var/cooldown = 0
var/cooldowndelay = 10
var/emagged = FALSE
w_class = WEIGHT_CLASS_NORMAL
/obj/item/weapon/cookiesynth/examine(mob/user)
..()
to_chat(user, "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>")
/obj/item/weapon/cookiesynth/attackby()
return
/obj/item/weapon/cookiesynth/emag_act(mob/user)
emagged = !emagged
if(emagged)
to_chat(user, "<span class='warning'>You short out [src]'s reagent safety checker!</span>")
else
to_chat(user, "<span class='warning'>You reset [src]'s reagent safety checker!</span>")
toxin = FALSE
/obj/item/weapon/cookiesynth/attack_self(mob/user)
var/mob/living/silicon/robot/P = null
if(isrobot(user))
P = user
if(emagged && !toxin)
toxin = TRUE
to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
else if(P.emagged && !toxin)
toxin = TRUE
to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
else
toxin = FALSE
to_chat(user, "<span class='notice'>Cookie Synthesizer Reset.</span>")
/obj/item/weapon/cookiesynth/process()
if(matter < 10)
matter++
/obj/item/weapon/cookiesynth/afterattack(atom/A, mob/user, proximity)
if(cooldown > world.time)
return
if(!proximity)
return
if(!(istype(A, /obj/structure/table) || isfloorturf(A)))
return
if(matter < 1)
to_chat(user, "<span class='warning'>[src] doesn't have enough matter left. Wait for it to recharge!</span>")
return
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(!R.cell || R.cell.charge < 400)
to_chat(user, "<span class='warning'>You do not have enough power to use [src].</span>")
return
var/turf/T = get_turf(A)
playsound(loc, 'sound/machines/click.ogg', 10, 1)
to_chat(user, "Fabricating Cookie..")
var/obj/item/weapon/reagent_containers/food/snacks/cookie/S = new /obj/item/weapon/reagent_containers/food/snacks/cookie(T)
if(toxin)
S.reagents.add_reagent("pancuronium", 2.4)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
R.cell.charge -= 100
else
matter--
cooldown = world.time + cooldowndelay
code/modules/admin/admin_verbs.dm
-1
View File
@@ -171,7 +171,6 @@ var/list/admin_verbs_debug = list(
/client/proc/map_template_upload,
/client/proc/view_runtimes,
/client/proc/admin_serialize,
/client/proc/admin_deserialize,
/client/proc/jump_to_ruin,
/client/proc/toggle_medal_disable,
/client/proc/startadmintickets,
code/modules/admin/verbs/serialization.dm
+2 -2
View File
@@ -3,7 +3,7 @@
set desc = "Turns your marked object into a JSON string you can later use to re-create the object"
set category = "Debug"
if(!check_rights(R_ADMIN))
if(!check_rights(R_ADMIN|R_DEBUG))
return
if(!istype(holder.marked_datum, /atom/movable))
@@ -18,7 +18,7 @@
set desc = "Creates an object from a JSON string"
set category = "Debug"
if(!check_rights(R_ADMIN|R_DEBUG))
if(!check_rights(R_SPAWN)) // this involves spawning things
return
var/json_text = input("Enter the JSON code:","Text") as message|null
code/modules/client/preference/preferences.dm
+3
View File
@@ -611,6 +611,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(available_in_playtime)
HTML += "<del>[rank]</del></td><td> \[ " + get_exp_format(available_in_playtime) + " as " + job.get_exp_req_type() + " \]</td></tr>"
continue
if(job.barred_by_disability(user.client))
HTML += "<del>[rank]</del></td><td> \[ DISABILITY \]</td></tr>"
continue
if(!job.player_old_enough(user.client))
var/available_in_days = job.available_in_days(user.client)
HTML += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
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"
code/modules/mob/new_player/new_player.dm
+5 -2
View File
@@ -236,6 +236,10 @@
if(!IsJobAvailable(rank))
to_chat(src, alert("[rank] is not available. Please try another."))
return 0
var/datum/job/thisjob = job_master.GetJob(rank)
if(thisjob.barred_by_disability(client))
to_chat(src, alert("[rank] is not available due to your character's disability. Please try another."))
return 0
job_master.AssignRole(src, rank, 1)
@@ -300,7 +304,6 @@
AnnounceArrival(character, rank, join_message)
callHook("latespawn", list(character))
var/datum/job/thisjob = job_master.GetJob(rank)
if(!thisjob.is_position_available() && thisjob in job_master.prioritized_jobs)
job_master.prioritized_jobs -= thisjob
qdel(src)
@@ -389,7 +392,7 @@
"Supply" = list(jobs = list(), titles = supply_positions, color = "#ead4ae"),
)
for(var/datum/job/job in job_master.occupations)
if(job && IsJobAvailable(job.title))
if(job && IsJobAvailable(job.title) && !job.barred_by_disability(client))
activePlayers[job] = 0
var/categorized = 0
// Only players with the job assigned and AFK for less than 10 minutes count as active
code/modules/reagents/chemistry/reagents/toxins.dm
-27
View File
@@ -1132,30 +1132,3 @@
M.electrocute_act(rand(5,20), "Teslium in their body", 1, 1) //Override because it's caused from INSIDE of you
playsound(M, "sparks", 50, 1)
..()
/datum/reagent/peaceborg/confuse
name = "Dizzying Solution"
id = "dizzysolution"
description = "Makes the target off balance and dizzy"
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
M.AdjustConfused(3, bound_lower = 0, bound_upper = 5)
M.AdjustDizzy(3, bound_lower = 0, bound_upper = 5)
if(prob(20))
to_chat(M, "<span class='warning'>You feel confused and disorientated.</span>")
..()
/datum/reagent/peaceborg/tire
name = "Tiring Solution"
id = "tiresolution"
description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
var/healthcomp = (M.maxHealth - M.health)
if(M.staminaloss < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
M.adjustStaminaLoss(10)
if(prob(30))
to_chat(M, "<span class='warning'>You feel like you should sit down and take a rest...</span>")
..()
code/modules/reagents/reagent_containers/borghydro.dm
-9
View File
@@ -33,15 +33,6 @@
reagent_ids = list("syndicate_nanites", "potass_iodide", "ether")
bypass_protection = 1
/obj/item/weapon/reagent_containers/borghypo/peace
name = "Peace Hypospray"
reagent_ids = list("dizzysolution","tiresolution")
/obj/item/weapon/reagent_containers/borghypo/peace/hacked
desc = "Everything's peaceful in death!"
icon_state = "borghypo_s"
reagent_ids = list("dizzysolution","tiresolution","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2")
/obj/item/weapon/reagent_containers/borghypo/New()
..()
for(var/R in reagent_ids)
config/example/config.txt
-8
View File
@@ -137,14 +137,6 @@ DEFAULT_NO_VOTE
## allow AI job
ALLOW_AI
## Secborg ###
## Uncomment to prevent the security cyborg module from being chosen
#DISABLE_SECBORG
## Peacekeeper Borg ###
## Uncomment to prevent the peacekeeper cyborg module from being chosen
#DISABLE_PEACEBORG
## Allow ghosts to see antagonist through AntagHUD
ALLOW_ANTAG_HUD
html/changelog.html
+6
View File
@@ -56,6 +56,12 @@
-->
<div class="commit sansserif">
<h2 class="date">05 December 2017</h2>
<h3 class="author">Kyep updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">Removed peacekeeper borgs.</li>
</ul>
<h2 class="date">04 December 2017</h2>
<h3 class="author">Tayyyyyyy updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+3
View File
@@ -5837,3 +5837,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: IPCs no longer vomit next to rotting bodies
Terillia:
- bugfix: Fixes the litch Hat and Sandals
2017-12-05:
Kyep:
- rscdel: Removed peacekeeper borgs.
icons/mob/robot_items.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

icons/mob/robots.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 KiB

After

Width:  |  Height:  |  Size: 216 KiB

sound/AI/harmalarm.ogg
BIN
View File
Binary file not shown.