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

APC screwdriving bug fixed.

Browse Source 
Experimental: welding helmet nerf. It now reduces view range. For now this feature is globally turned off by default. Admins in game can turn it on if they like it. See "debug" tab.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@897 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-01-21 22:47:27 +00:00
parent ca38eb1eb8
commit ab2ddb2fa7
6 changed files with 93 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+11
View File
@@ -2209,6 +2209,17 @@ var/showadminmessages = 1
usr << "Sorry, this mob have no mind!"
M.mind.edit_memory()
/obj/admins/proc/toggletintedweldhelmets()
set category = "Debug"
set desc="Reduces view range when wearing welding helmets"
set name="Toggle tinted welding helmes"
tinted_weldhelh = !( tinted_weldhelh )
if (tinted_weldhelh)
world << "<B>The tinted_weldhelh has been enabled!</B>"
else
world << "<B>The tinted_weldhelh has been disabled!</B>"
log_admin("[key_name(usr)] toggled tinted_weldhelh.")
message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1)
//
//
//ALL DONE
code/modules/admin/admin_verbs.dm
+7
View File
@@ -80,6 +80,8 @@
src.verbs += /client/proc/ticklag
src.verbs += /proc/givetestverbs
src.verbs += /obj/admins/proc/spawn_atom
src.verbs += /obj/admins/proc/toggletintedweldhelmets
// Admin helpers
src.verbs += /client/proc/cmd_admin_attack_log
@@ -204,6 +206,7 @@
src.verbs += /client/proc/ticklag
src.verbs += /proc/givetestverbs
src.verbs += /obj/admins/proc/spawn_atom
src.verbs += /obj/admins/proc/toggletintedweldhelmets
// Admin helpers
src.verbs += /client/proc/cmd_admin_attack_log
@@ -329,6 +332,7 @@
//src.verbs += /client/proc/ticklag
//src.verbs += /proc/givetestverbs
//src.verbs += /obj/admins/proc/spawn_atom
src.verbs += /obj/admins/proc/toggletintedweldhelmets
// Admin helpers
src.verbs += /client/proc/cmd_admin_attack_log
@@ -481,6 +485,7 @@
//src.verbs += /client/proc/ticklag
//src.verbs += /proc/givetestverbs
//src.verbs += /obj/admins/proc/spawn_atom
src.verbs += /obj/admins/proc/toggletintedweldhelmets
// Admin helpers
src.verbs += /client/proc/cmd_admin_attack_log
@@ -623,6 +628,7 @@
//src.verbs += /client/proc/ticklag
//src.verbs += /proc/givetestverbs
//src.verbs += /obj/admins/proc/spawn_atom
src.verbs += /obj/admins/proc/toggletintedweldhelmets
// Admin helpers
//src.verbs += /client/proc/cmd_admin_attack_log
@@ -1036,6 +1042,7 @@
src.verbs -= /client/proc/ticklag
src.verbs -= /proc/givetestverbs
src.verbs -= /obj/admins/proc/spawn_atom
src.verbs -= /obj/admins/proc/toggletintedweldhelmets
// Admin helpers
src.verbs -= /client/proc/cmd_admin_attack_log
code/modules/mob/living/carbon/human/hud.dm
+65
View File
@@ -388,6 +388,71 @@
using.mouse_opacity = 0
src.vimpaired += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "dither50"
using.screen_loc = "3,3 to 5,13"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "dither50"
using.screen_loc = "5,3 to 10,5"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "dither50"
using.screen_loc = "6,11 to 10,13"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "dither50"
using.screen_loc = "11,3 to 13,13"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "black"
using.screen_loc = "1,1 to 15,2"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "black"
using.screen_loc = "1,3 to 2,15"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "black"
using.screen_loc = "14,3 to 15,15"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
using = new src.h_type( src )
using.name = null
using.icon = ui_style
using.icon_state = "black"
using.screen_loc = "3,14 to 13,15"
using.layer = 17
using.mouse_opacity = 0
src.darkMask += using
mymob.throw_icon = new /obj/screen(null)
mymob.throw_icon.icon = ui_style
mymob.throw_icon.icon_state = "act_throw_off"
code/modules/mob/living/carbon/human/life.dm
+7
View File
@@ -720,6 +720,9 @@
if(!seer)
src.see_invisible = 0
if (istype(src.head, /obj/item/clothing/head/helmet/welding) && tinted_weldhelh)
src.see_in_dark = 0
if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
@@ -791,6 +794,7 @@
src.client.screen -= src.hud_used.blurry
src.client.screen -= src.hud_used.druggy
src.client.screen -= src.hud_used.vimpaired
src.client.screen -= src.hud_used.darkMask
if ((src.blind && src.stat != 2))
if ((src.blinded))
@@ -807,6 +811,9 @@
if (src.druggy)
src.client.screen += src.hud_used.druggy
if (istype(src.head, /obj/item/clothing/head/helmet/welding) && tinted_weldhelh)
src.client.screen += src.hud_used.darkMask
if (src.stat != 2)
if (src.machine)
if (!( src.machine.check_eye(src) ))
code/modules/power/apc.dm
+2 -2
View File
@@ -261,7 +261,7 @@
W.loc = src
cell = W
user.visible_message(\
"\red [user.name] has inserted the power cell. to [src.name]!",\
"\red [user.name] has inserted the power cell to [src.name]!",\
"You insert the power cell.")
chargecount = 0
updateicon()
@@ -271,7 +271,7 @@
user << "\red Close the APC first." //Less hints more mystery!
return
else
if (has_electronics==1)
if (has_electronics==1 && terminal)
has_electronics = 2
stat &= ~MAINT
playsound(src.loc, 'Screwdriver.ogg', 50, 1)