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

TG: - hand tools now fit on your belt slot

Browse Source 
- added feedback logging for newscasters
- added feedback logging for admin verbs
- added shuttle timers to escape pods
- added feedback logging to chemical reactions
- clipboard can now fit on your belt
Revision: r3465
Author: 	 baloh.matevz
This commit is contained in:
Erthilo
2012-05-05 21:34:34 +01:00
parent 1f3b52f84f
commit afd33125ab
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/obj/weapon.dm
View File

@@ -639,7 +639,7 @@
w_class = 2.0 w_class = 2.0
throw_speed = 3 throw_speed = 3
throw_range = 10 throw_range = 10
flags = ONBELT flags = FPRINT | TABLEPASS | ONBELT
/obj/item/weapon/clipboard/notebook /obj/item/weapon/clipboard/notebook
name = "notebook" name = "notebook"

4
code/game/machinery/newscaster.dm
View File

@@ -615,11 +615,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
if( istype(I, /obj/item/device/pda) ) if( istype(I, /obj/item/device/pda) )
var/obj/item/device/pda/P = I var/obj/item/device/pda/P = I
if(P.id) if(P.id)
src.scanned_user = "[P.id.registered] ([P.id.assignment])" src.scanned_user = "[P.id.registered_name] ([P.id.assignment])"
src.screen=2 src.screen=2
else else
var/obj/item/weapon/card/id/T = I var/obj/item/weapon/card/id/T = I
src.scanned_user = text("[T.registered] ([T.assignment])") src.scanned_user = text("[T.registered_name] ([T.assignment])")
src.screen=2*/ //Obsolete after autorecognition src.screen=2*/ //Obsolete after autorecognition
if (src.isbroken) if (src.isbroken)

6
code/game/objects/items/weapons/tools.dm
View File

@@ -13,7 +13,7 @@ WELDINGTOOOL
desc = "A wrench with common uses. Can be found in your hand." desc = "A wrench with common uses. Can be found in your hand."
icon = 'items.dmi' icon = 'items.dmi'
icon_state = "wrench" icon_state = "wrench"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
force = 5.0 force = 5.0
throwforce = 7.0 throwforce = 7.0
w_class = 2.0 w_class = 2.0
@@ -44,7 +44,7 @@ WELDINGTOOOL
name = "Welding Tool" name = "Welding Tool"
icon = 'items.dmi' icon = 'items.dmi'
icon_state = "welder" icon_state = "welder"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
force = 3.0 force = 3.0
throwforce = 5.0 throwforce = 5.0
throw_speed = 1 throw_speed = 1
@@ -310,7 +310,7 @@ WELDINGTOOOL
desc = "This cuts wires." desc = "This cuts wires."
icon = 'items.dmi' icon = 'items.dmi'
icon_state = "cutters" icon_state = "cutters"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
force = 6.0 force = 6.0
throw_speed = 2 throw_speed = 2
throw_range = 9 throw_range = 9

12
code/modules/admin/admin.dm
View File

@@ -522,8 +522,8 @@ var/global/BSACooldown = 0
for(var/job in notbannedlist) for(var/job in notbannedlist)
ban_unban_log_save("[key_name(usr)] jobbanned [key_name(M)] from [job]. reason: [reason]") ban_unban_log_save("[key_name(usr)] jobbanned [key_name(M)] from [job]. reason: [reason]")
log_admin("[key_name(usr)] banned [key_name(M)] from [job]") log_admin("[key_name(usr)] banned [key_name(M)] from [job]")
feedback_inc("ban_job",1) //feedback_inc("ban_job",1)
feedback_add_details("ban_job","- [job]") //feedback_add_details("ban_job","- [job]")
jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
if(!msg) msg = job if(!msg) msg = job
else msg += ", [job]" else msg += ", [job]"
@@ -547,8 +547,8 @@ var/global/BSACooldown = 0
if("Yes") if("Yes")
ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]") ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]")
log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]") log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]")
feedback_inc("ban_job_unban",1) //feedback_inc("ban_job_unban",1)
feedback_add_details("ban_job_unban","- [job]") //feedback_add_details("ban_job_unban","- [job]")
jobban_unban(M, job) jobban_unban(M, job)
if(!msg) msg = job if(!msg) msg = job
else msg += ", [job]" else msg += ", [job]"
@@ -1615,8 +1615,8 @@ var/global/BSACooldown = 0
ok = 1*/ ok = 1*/
if("toxic") if("toxic")
/* /*
feedback_inc("admin_secrets_fun_used",1) //feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","T") //feedback_add_details("admin_secrets_fun_used","T")
for(var/obj/machinery/atmoalter/siphs/fullairsiphon/O in world) for(var/obj/machinery/atmoalter/siphs/fullairsiphon/O in world)
O.t_status = 3 O.t_status = 3
for(var/obj/machinery/atmoalter/siphs/scrubbers/O in world) for(var/obj/machinery/atmoalter/siphs/scrubbers/O in world)

2
code/modules/admin/admin_verbs.dm
View File

@@ -625,7 +625,7 @@
log_admin("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.") log_admin("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
ban_unban_log_save("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.") ban_unban_log_save("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
message_admins("\blue [ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.") message_admins("\blue [ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
feedback_inc("ban_warn",1) //feedback_inc("ban_warn",1)
del(M.client) del(M.client)
// feedback_add_details("admin_verb","WARN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! // feedback_add_details("admin_verb","WARN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!