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

Fized intents, gun toggle is odd...

Browse Source
This commit is contained in:
Aurorablade
2015-11-30 00:17:38 -05:00
parent 58195b8e85
commit a451932e74
3 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/human.dm
+2 -1
View File
@@ -47,7 +47,7 @@
action_intent = using
//intent small hud objects
var/icon/ico
/* var/icon/ico
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
@@ -96,6 +96,7 @@
using.layer = 21
src.adding += using
hurt_intent = using
*/
//end intent small hud objects
code/_onclick/hud/monkey.dm
+2 -2
View File
@@ -20,7 +20,7 @@
action_intent = using
//intent small hud objects
var/icon/ico
/* var/icon/ico
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
@@ -69,7 +69,7 @@
using.layer = 21
src.adding += using
hurt_intent = using
*/
//end intent small hud objects
using = new /obj/screen/mov_intent()
code/_onclick/hud/screen_objects.dm
+33 -28
View File
@@ -68,19 +68,22 @@
icon_state = "help"
/obj/screen/act_intent/Click(location, control, params)
usr.a_intent_change("right")
if("help")
usr.a_intent = I_HELP
usr.hud_used.action_intent.icon_state = "intent_help"
if("harm")
usr.a_intent = I_HARM
usr.hud_used.action_intent.icon_state = "intent_harm"
if("grab")
usr.a_intent = I_GRAB
usr.hud_used.action_intent.icon_state = "intent_grab"
if("disarm")
usr.a_intent = I_DISARM
usr.hud_used.action_intent.icon_state = "intent_disarm"
if(ishuman(usr))
var/_x = text2num(params2list(params)["icon-x"])
var/_y = text2num(params2list(params)["icon-y"])
if(_x<=16 && _y<=16)
usr.a_intent_change(I_HARM)
else if(_x<=16 && _y>=17)
usr.a_intent_change(I_HELP)
else if(_x>=17 && _y<=16)
usr.a_intent_change(I_GRAB)
else if(_x>=17 && _y>=17)
usr.a_intent_change(I_DISARM)
else
usr.a_intent_change("right")
/obj/screen/internals
name = "toggle internals"
@@ -196,7 +199,6 @@
else
C << "<span class='notice'>You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.</span>"
/obj/screen/mov_intent
name = "run/walk toggle"
icon = 'icons/mob/screen1_midnight.dmi'
@@ -220,6 +222,8 @@
if(istype(usr,/mob/living/carbon/alien/humanoid))
usr.update_icons()
/obj/screen/pull
name = "stop pulling"
icon = 'icons/mob/screen1_Midnight.dmi'
@@ -349,26 +353,27 @@
master = null
dir = 2
/*move
name = "Allow Walking"
icon_state = "no_walk0"
screen_loc = ui_gun2
/obj/screen/gun/mode
name = "Toggle Gun Mode"
icon_state = "gun0"
screen_loc = ui_gun_select
run
name = "Allow Running"
icon_state = "no_run0"
screen_loc = ui_gun3*/
/obj/screen/gun/mode/Click()
usr.client.ToggleGunMode()
item
/obj/screen/gun/item
name = "Allow Item Use"
icon_state = "no_item0"
screen_loc = ui_gun1
mode
name = "Toggle Gun Mode"
icon_state = "gun0"
screen_loc = ui_gun_select
//dir = 1
/obj/screen/gun/item/Click()
if(gun_click_time > world.time - 30) //give them 3 seconds between mode changes.
return
if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
usr << "You need your gun in your active hand to do that!"
return
usr.client.AllowTargetClick()
gun_click_time = world.time
/obj/screen/inventory/Click()