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

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Erthilo
2013-05-25 22:16:29 +01:00
parent 77c51235af d8ed2d2b29
commit e2ea94d59c
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/jobs/job/job.dm
View File

@@ -4,8 +4,8 @@
var/title = "NOPE" var/title = "NOPE"
//Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access
var/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population)
var/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) var/list/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!)
//Bitflags for the job //Bitflags for the job
var/flag = 0 var/flag = 0
@@ -46,12 +46,12 @@
/datum/job/proc/get_access() /datum/job/proc/get_access()
if(!config) //Needed for robots. if(!config) //Needed for robots.
return src.minimal_access return src.minimal_access.Copy()
if(config.jobs_have_minimal_access) if(config.jobs_have_minimal_access)
return src.minimal_access return src.minimal_access.Copy()
else else
return src.access return src.access.Copy()
//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
/datum/job/proc/player_old_enough(client/C) /datum/job/proc/player_old_enough(client/C)

8
code/game/objects/items/weapons/swords_axes_etc.dm
View File

@@ -120,8 +120,8 @@
/obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob)
on = !on on = !on
if(on) if(on)
user.visible_message("\red You extend the baton.",\ user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\
"\red With a flick of their wrist, [user] extends their telescopic baton.",\ "\red You extend the baton.",\
"You hear an ominous click.") "You hear an ominous click.")
icon_state = "telebaton_1" icon_state = "telebaton_1"
item_state = "telebaton_1" item_state = "telebaton_1"
@@ -129,8 +129,8 @@
force = 15//quite robust force = 15//quite robust
attack_verb = list("smacked", "struck", "slapped") attack_verb = list("smacked", "struck", "slapped")
else else
user.visible_message("\blue You collapse the baton.",\ user.visible_message("\blue [user] collapses their telescopic baton.",\
"\blue [user] collapses their telescopic baton.",\ "\blue You collapse the baton.",\
"You hear a click.") "You hear a click.")
icon_state = "telebaton_0" icon_state = "telebaton_0"
item_state = "telebaton_0" item_state = "telebaton_0"

3
code/modules/mob/living/carbon/human/death.dm
View File

@@ -48,9 +48,6 @@
/mob/living/carbon/human/death(gibbed) /mob/living/carbon/human/death(gibbed)
if(halloss > 0 && !gibbed)
halloss = 0
return
if(stat == DEAD) return if(stat == DEAD) return
if(healths) healths.icon_state = "health5" if(healths) healths.icon_state = "health5"
stat = DEAD stat = DEAD

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

@@ -210,14 +210,14 @@
/mob/living/silicon/robot/verb/Namepick() /mob/living/silicon/robot/verb/Namepick()
if(custom_name) if(custom_name)
return 0 return 0
spawn(0)
var/newname
newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text
if (newname != "")
custom_name = newname
var/newname updatename("Default")
newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text updateicon()
if (newname != "")
custom_name = newname
updatename("Default")
updateicon()
/mob/living/silicon/robot/verb/cmd_robot_alerts() /mob/living/silicon/robot/verb/cmd_robot_alerts()
set category = "Robot Commands" set category = "Robot Commands"