mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
Poker table fix, two handed fix, Nukeops naming
- Poker tables now actually use the poker table icon. I don't reccomend you use this, as the poker table icon doesn't mesh well as of right now. Plan to fix that at a later date. - Items that require two hands now properly update when wielded/unweilded. Hooray. - Minor changes to the way nukeops naming works.
This commit is contained in:
@@ -73,6 +73,12 @@
|
||||
var/obj/item/weapon/twohanded/offhand/O = user.get_inactive_hand()
|
||||
if(O && istype(O))
|
||||
O.unwield()
|
||||
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.update_inv_l_hand()
|
||||
H.update_inv_r_hand()
|
||||
add_fingerprint(user)
|
||||
return
|
||||
|
||||
else //Trying to wield it
|
||||
@@ -88,6 +94,12 @@
|
||||
O.name = "[initial(name)] - offhand"
|
||||
O.desc = "Your second grip on the [initial(name)]"
|
||||
user.put_in_inactive_hand(O)
|
||||
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.update_inv_l_hand()
|
||||
H.update_inv_r_hand()
|
||||
add_fingerprint(user)
|
||||
return
|
||||
|
||||
///////////OFFHAND///////////////
|
||||
@@ -198,6 +210,17 @@ obj/item/weapon/twohanded/
|
||||
edge = 1
|
||||
no_embed = 1 // Like with the single-handed esword, this shouldn't be embedding in people.
|
||||
|
||||
/* Here for when we can add items to left and right hands again, but currently this cannot be done due to the lack of in-hand icons for dual eswords aside from the green one.
|
||||
/obj/item/weapon/twohanded/dualsaber/New()
|
||||
item_color = pick("red", "blue", "green", "purple")
|
||||
|
||||
/obj/item/weapon/twohanded/dualsaber/update_icon()
|
||||
if(wielded)
|
||||
icon_state = "dualsaber[item_color][wielded]"
|
||||
else
|
||||
icon_state = "dualsaber0"
|
||||
*/
|
||||
|
||||
/obj/item/weapon/twohanded/dualsaber/update_icon()
|
||||
icon_state = "dualsaber[wielded]"
|
||||
return
|
||||
|
||||
@@ -213,6 +213,22 @@
|
||||
icon_state = "reinf_tabledir2"
|
||||
if(6)
|
||||
icon_state = "reinf_tabledir3"
|
||||
else if(istype(src,/obj/structure/table/woodentable/poker))
|
||||
switch(table_type)
|
||||
if(0)
|
||||
icon_state = "pokertable_table"
|
||||
if(1)
|
||||
icon_state = "pokertable_1tileendtable"
|
||||
if(2)
|
||||
icon_state = "pokertable_1tilethick"
|
||||
if(3)
|
||||
icon_state = "pokertable_tabledir"
|
||||
if(4)
|
||||
icon_state = "pokertable_middle"
|
||||
if(5)
|
||||
icon_state = "pokertable_tabledir2"
|
||||
if(6)
|
||||
icon_state = "pokertable_tabledir3"
|
||||
else if(istype(src,/obj/structure/table/woodentable))
|
||||
switch(table_type)
|
||||
if(0)
|
||||
|
||||
Reference in New Issue
Block a user