mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
adds clown glue
This commit is contained in:
@@ -17,10 +17,10 @@
|
||||
if(cur_assembly)
|
||||
to_chat(user, "<span class='warning'>There is already a fuel rod assembly in there!</span>")
|
||||
else
|
||||
cur_assembly = I
|
||||
user.drop_item(I, src)
|
||||
icon_state = "port1"
|
||||
to_chat(user, "<span class='notice'>You insert [I] into [src]. Touch the panel again to insert [I] into the injector.</span>")
|
||||
if(user.drop_item(I, src))
|
||||
cur_assembly = I
|
||||
icon_state = "port1"
|
||||
to_chat(user, "<span class='notice'>You insert [I] into [src]. Touch the panel again to insert [I] into the injector.</span>")
|
||||
|
||||
/obj/machinery/rust_fuel_assembly_port/attack_hand(mob/user)
|
||||
add_fingerprint(user)
|
||||
|
||||
@@ -73,10 +73,10 @@
|
||||
|
||||
if(istype(W, /obj/item/weapon/fuel_assembly) && !cur_assembly)
|
||||
if(emergency_insert_ready)
|
||||
cur_assembly = W
|
||||
user.drop_item(W, src)
|
||||
emergency_insert_ready = 0
|
||||
return
|
||||
if(user.drop_item(W, src))
|
||||
cur_assembly = W
|
||||
emergency_insert_ready = 0
|
||||
return
|
||||
|
||||
..()
|
||||
return
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
if (contents.len >= max_butts)
|
||||
to_chat(user, "This ashtray is full.")
|
||||
return
|
||||
user.drop_item(W, src)
|
||||
user.drop_item(W, src, force_drop = 1)
|
||||
var/obj/item/clothing/mask/cigarette/cig = W
|
||||
if(istype(cig, /obj/item/weapon/cigbutt))
|
||||
to_chat(user, "You drop the [cig] into [src].")
|
||||
|
||||
@@ -89,11 +89,11 @@ log transactions
|
||||
if(istype(I, /obj/item/weapon/card/id))
|
||||
var/obj/item/weapon/card/id/idcard = I
|
||||
if(!held_card)
|
||||
usr.drop_item(idcard, src)
|
||||
held_card = idcard
|
||||
if(authenticated_account && held_card.associated_account_number != authenticated_account.account_number)
|
||||
authenticated_account = null
|
||||
src.attack_hand(user)
|
||||
if(usr.drop_item(idcard, src))
|
||||
held_card = idcard
|
||||
if(authenticated_account && held_card.associated_account_number != authenticated_account.account_number)
|
||||
authenticated_account = null
|
||||
src.attack_hand(user)
|
||||
else if(authenticated_account)
|
||||
if(istype(I,/obj/item/weapon/spacecash))
|
||||
var/obj/item/weapon/spacecash/dosh = I
|
||||
@@ -456,8 +456,8 @@ log transactions
|
||||
else
|
||||
var/obj/item/I = usr.get_active_hand()
|
||||
if (istype(I, /obj/item/weapon/card/id))
|
||||
usr.drop_item(I, src)
|
||||
held_card = I
|
||||
if(usr.drop_item(I, src))
|
||||
held_card = I
|
||||
if("logout")
|
||||
authenticated_account = null
|
||||
failsafe = 1
|
||||
|
||||
@@ -155,8 +155,8 @@ var/list/alldepartments = list("Central Command")
|
||||
else
|
||||
var/obj/item/I = usr.get_active_hand()
|
||||
if (istype(I, /obj/item/weapon/card/id))
|
||||
usr.drop_item(I, src)
|
||||
scan = I
|
||||
if(usr.drop_item(I, src))
|
||||
scan = I
|
||||
authenticated = 0
|
||||
|
||||
if(href_list["dept"])
|
||||
@@ -180,11 +180,11 @@ var/list/alldepartments = list("Central Command")
|
||||
|
||||
if(istype(O, /obj/item/weapon/paper))
|
||||
if(!tofax)
|
||||
user.drop_item(O, src)
|
||||
tofax = O
|
||||
to_chat(user, "<span class='notice'>You insert the paper into \the [src].</span>")
|
||||
flick("faxsend", src)
|
||||
updateUsrDialog()
|
||||
if(user.drop_item(O, src))
|
||||
tofax = O
|
||||
to_chat(user, "<span class='notice'>You insert the paper into \the [src].</span>")
|
||||
flick("faxsend", src)
|
||||
updateUsrDialog()
|
||||
else
|
||||
to_chat(user, "<span class='notice'>There is already something in \the [src].</span>")
|
||||
|
||||
@@ -192,8 +192,8 @@ var/list/alldepartments = list("Central Command")
|
||||
|
||||
var/obj/item/weapon/card/id/idcard = O
|
||||
if(!scan)
|
||||
usr.drop_item(idcard, src)
|
||||
scan = idcard
|
||||
if(usr.drop_item(idcard, src))
|
||||
scan = idcard
|
||||
|
||||
else if(istype(O, /obj/item/weapon/wrench))
|
||||
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
|
||||
|
||||
@@ -122,9 +122,9 @@
|
||||
if(battery)
|
||||
to_chat(user, "<span class='notice'>The pod already has a battery.</span>")
|
||||
return
|
||||
user.drop_item(W, src)
|
||||
battery = W
|
||||
return
|
||||
if(user.drop_item(W, src))
|
||||
battery = W
|
||||
return
|
||||
if(istype(W, /obj/item/device/spacepod_equipment))
|
||||
if(!hatch_open)
|
||||
return ..()
|
||||
@@ -136,13 +136,12 @@
|
||||
to_chat(user, "<span class='notice'>The pod already has a weapon system, remove it first.</span>")
|
||||
return
|
||||
else
|
||||
to_chat(user, "<span class='notice'>You insert \the [W] into the equipment system.</span>")
|
||||
user.drop_item(W, equipment_system)
|
||||
equipment_system.weapon_system = W
|
||||
equipment_system.weapon_system.my_atom = src
|
||||
new/obj/item/device/spacepod_equipment/weaponry/proc/fire_weapon_system(src, equipment_system.weapon_system.verb_name, equipment_system.weapon_system.verb_desc) //Yes, it has to be referenced like that. W.verb_name/desc doesn't compile.
|
||||
return
|
||||
|
||||
if(user.drop_item(W, equipment_system))
|
||||
to_chat(user, "<span class='notice'>You insert \the [W] into the equipment system.</span>")
|
||||
equipment_system.weapon_system = W
|
||||
equipment_system.weapon_system.my_atom = src
|
||||
new/obj/item/device/spacepod_equipment/weaponry/proc/fire_weapon_system(src, equipment_system.weapon_system.verb_name, equipment_system.weapon_system.verb_desc) //Yes, it has to be referenced like that. W.verb_name/desc doesn't compile.
|
||||
return
|
||||
|
||||
/obj/spacepod/attack_hand(mob/user as mob)
|
||||
if(!hatch_open)
|
||||
|
||||
Reference in New Issue
Block a user