mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 10:03:50 +01:00
Countinue sorting verbs by tabs.
Fixed grenade sprites. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1300 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
user << "\blue You add [W] to the metal casing."
|
||||
playsound(src.loc, 'Screwdriver2.ogg', 25, -3)
|
||||
del(W) //Okay so we're not really adding anything here. cheating.
|
||||
icon_state = "chemg2"
|
||||
icon_state = initial(icon_state) +"_ass"
|
||||
name = "unsecured grenade"
|
||||
stage = 1
|
||||
else if(istype(W,/obj/item/weapon/screwdriver) && stage == 1 && path != 2)
|
||||
@@ -44,7 +44,7 @@
|
||||
user << "\blue You lock the assembly."
|
||||
playsound(src.loc, 'Screwdriver.ogg', 25, -3)
|
||||
name = "grenade"
|
||||
icon_state = "chemg3"
|
||||
icon_state = initial(icon_state) +"_locked"
|
||||
stage = 2
|
||||
else
|
||||
user << "\red You need to add at least one beaker before locking the assembly."
|
||||
@@ -439,6 +439,7 @@
|
||||
|
||||
verb/set_APTFT() //set amount_per_transfer_from_this
|
||||
set name = "Set transfer amount"
|
||||
set category = "Object"
|
||||
set src in view(1)
|
||||
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
|
||||
if (N)
|
||||
@@ -481,6 +482,7 @@
|
||||
|
||||
verb/set_APTFT() //set amount_per_transfer_from_this
|
||||
set name = "Set transfer amount"
|
||||
set category = "Object"
|
||||
set src in range(0)
|
||||
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
|
||||
if (N)
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
L.Add(T)
|
||||
return L
|
||||
|
||||
|
||||
|
||||
/obj/alien/facehugger
|
||||
name = "alien"
|
||||
desc = "An alien, looks pretty scary!"
|
||||
@@ -139,8 +137,9 @@
|
||||
|
||||
|
||||
verb/follow()
|
||||
set src in view()
|
||||
set src in view() //set src in get_aliens(view()) - does not work, damn shitty byond :( -- rastaf0
|
||||
set name = "Follow Me"
|
||||
set category = "Object" //"Alien" does not work perfect - humans get "Alien" tab too, that's annoying
|
||||
if(!alive) return
|
||||
if(!isalien(usr))
|
||||
usr << text("\red <B>The alien ignores you.</B>")
|
||||
@@ -156,6 +155,7 @@
|
||||
verb/stop()
|
||||
set src in view()
|
||||
set name = "Stop Following"
|
||||
set category = "Object"
|
||||
if(!alive) return
|
||||
if(!isalien(usr))
|
||||
usr << text("\red <B>The alien ignores you.</B>")
|
||||
|
||||
@@ -4,8 +4,7 @@ proc/empulse(turf/epicenter, heavy_range, light_range, nolog=0)
|
||||
message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
|
||||
|
||||
if (!istype(epicenter, /turf))
|
||||
epicenter = epicenter.loc
|
||||
return empulse(epicenter, heavy_range, light_range)
|
||||
epicenter = get_turf(epicenter.loc)
|
||||
|
||||
if(heavy_range > 1)
|
||||
var/obj/overlay/pulse = new/obj/overlay ( epicenter )
|
||||
|
||||
Reference in New Issue
Block a user