mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Fixed some typos in traitorchan (lol).
Adjusted ninja random event to go with the new mode changes. Due to inclusion of monkey mode, added back monkey ability to vent crawl. Identical to larva. Brains can now suicide. Warden now starts out with a special hat. Welcome to Hat Station 13. Holograms should no longer be draggable by space wind. Slight change to pulse rifle so it looks like the older sprite. Added deathsquad armor to admin equip list. Added tunnel clown gear to admin equip list. Fixed minor announcement bug with respawn_character. PDAs now redirect to Notekeeper when the code is used again with an unlocked uplink. Added a note for built AIs to adjust camera network. Camera movement doesn't always work right without adjusting the network first. Ninjas can now hold an extra battery in their hat and suit slots. C4s now give a message when planted on people and are recorded in the attack log. Fixed spelling on messaging server. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1735 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -210,7 +210,7 @@
|
||||
|
||||
if (1)
|
||||
dat += "<h4><img src=pda_notes.png> Notekeeper V2.1</h4>"
|
||||
if ((!isnull(uplink)) && (uplink.active))
|
||||
if ((!isnull(uplink)) && uplink.active)
|
||||
dat += "<a href='byond://?src=\ref[src];choice=Lock'> Lock</a><br>"
|
||||
else
|
||||
dat += "<a href='byond://?src=\ref[src];choice=Edit'> Edit</a><br>"
|
||||
@@ -411,9 +411,13 @@
|
||||
var/t = input(U, "Please enter new ringtone", name, ttone) as text
|
||||
if (in_range(src, U) && loc == U)
|
||||
if (t)
|
||||
if ((uplink) && (cmptext(t,uplink.lock_code)) && (!uplink.active))
|
||||
U << "The PDA softly beeps."
|
||||
uplink.unlock()
|
||||
if ((uplink) && (cmptext(t,uplink.lock_code)))
|
||||
if(uplink.active)
|
||||
U << "The PDA uplink is already unlocked."
|
||||
mode = 1
|
||||
else
|
||||
U << "The PDA softly beeps."
|
||||
uplink.unlock()
|
||||
else
|
||||
t = copytext(sanitize(t), 1, 20)
|
||||
ttone = t
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/item/weapon/plastique/attack_self(mob/user as mob)
|
||||
var/newtime = input(usr, "Please set the timer.", "Timer", 10)
|
||||
src.timer = newtime
|
||||
user << "Timer set for [src.timer] seconds."
|
||||
timer = newtime
|
||||
user << "Timer set for [timer] seconds."
|
||||
|
||||
/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag)
|
||||
if (!flag)
|
||||
@@ -9,23 +9,29 @@
|
||||
if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle))
|
||||
return
|
||||
user << "Planting explosives..."
|
||||
if(do_after(user, 50) && get_dist(user, target) <= 1)
|
||||
if(ismob(target))
|
||||
user.attack_log += "<font color='red'>[world.time] - [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])</font>"
|
||||
user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!")
|
||||
if(do_after(user, 50) && in_range(user, target))
|
||||
user.drop_item()
|
||||
src.target = target
|
||||
src.loc = null
|
||||
target = target
|
||||
loc = null
|
||||
var/location
|
||||
if (isturf(target)) location = target
|
||||
if (isobj(target)) location = target.loc
|
||||
if (ismob(target))
|
||||
target:attack_log += "<font color='orange'>[world.time] - had the [name] planted on them by [user.real_name] ([user.ckey])</font>"
|
||||
user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
|
||||
target.overlays += image('assemblies.dmi', "plastic-explosive2")
|
||||
user << "Bomb has been planted. Timer counting down from [src.timer]."
|
||||
spawn(src.timer*10)
|
||||
user << "Bomb has been planted. Timer counting down from [timer]."
|
||||
spawn(timer*10)
|
||||
if(target)
|
||||
explosion(location, -1, -1, 2, 3)
|
||||
if (istype(src.target, /turf/simulated/wall)) src.target:dismantle_wall(1)
|
||||
else src.target.ex_act(1)
|
||||
if (isobj(src.target))
|
||||
if (src.target)
|
||||
del(src.target)
|
||||
if (istype(target, /turf/simulated/wall)) target:dismantle_wall(1)
|
||||
else target.ex_act(1)
|
||||
if (isobj(target))
|
||||
if (target)
|
||||
del(target)
|
||||
if (src)
|
||||
del(src)
|
||||
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
|
||||
/obj/item/weapon/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
|
||||
src.icon_state = text("fireaxe[]",src.wielded)
|
||||
icon_state = text("fireaxe[]",wielded)
|
||||
return
|
||||
|
||||
/obj/item/weapon/fireaxe/pickup(mob/user)
|
||||
src.wielded = 0
|
||||
src.name = "Fire Axe (Unwielded)"
|
||||
wielded = 0
|
||||
name = "Fire Axe (Unwielded)"
|
||||
|
||||
/obj/item/weapon/fireaxe/attack_self(mob/user as mob)
|
||||
if( istype(user,/mob/living/carbon/monkey) )
|
||||
|
||||
Reference in New Issue
Block a user