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

Merge pull request #9514 from variableundefined/LightFIXture

Browse Source 
Bugfix for card & lightning
This commit is contained in:
Fox McCloud
2018-09-27 17:15:38 -04:00
committed by GitHub
parent c4a7fe9291 d46608590f
commit 6b8b849c27
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/games/cards.dm
+3 -3
View File
@@ -252,7 +252,7 @@
/obj/item/pack/attack_self(mob/user as mob)
user.visible_message("<span class='notice'>[name] rips open the [src]!</span>", "<span class='notice'>You rips open the [src]!</span>")
var/obj/item/cardhand/H = new()
var/obj/item/cardhand/H = new(get_turf(user))
H.cards += cards
cards.Cut()
@@ -260,7 +260,7 @@
qdel(src)
H.update_icon()
user.put_in_active_hand(H)
user.put_in_hands(H)
/obj/item/cardhand
name = "hand of cards"
@@ -370,7 +370,7 @@
var/datum/playingcard/card = pickablecards[pickedcard]
var/obj/item/cardhand/H = new(get_turf(src))
user.put_in_active_hand(H)
user.put_in_hands(H)
H.cards += card
cards -= card
H.parentdeck = parentdeck
code/modules/power/lighting.dm
+2 -2
View File
@@ -484,7 +484,7 @@
// create a light tube/bulb item and put it in the user's hand
var/obj/item/light/L = new light_type()
var/obj/item/light/L = new light_type(get_turf(user))
L.status = status
L.rigged = rigged
L.brightness_range = brightness_range
@@ -499,7 +499,7 @@
L.update()
L.add_fingerprint(user)
user.put_in_active_hand(L) //puts it in our active hand
user.put_in_hands(L) //puts it in our active hand
status = LIGHT_EMPTY
update()