mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-10 09:31:52 +00:00
36effbacc2
traitor expansion, so I'll try to be brief: - I added in the foundations for traitor factions. See factions.dm for all the different faction datums. They don't do anything yet. - I completely ported mob/var/mutations from a bitfield to a generic list. Mutation enumerated-identifiers are added into this list. For instance, TK = 1, COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise operations could not actually be used after a certain size (because BYOND is stuck in the 16bit era). - I've added in completely-functional nano-augmentations. Check under implantnanoaug.dm for a list of implants and implaners. As mentioned previously, they are completely functional but may be slightly OP. Among these nanoaugs are Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer, Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't go into detail as to what they do, but hopefully they should be self- explanitory. If not, check out their descriptions in the file previously mentioned. - Added in a future traitor item, the Mind Batterer. Along with it a new .ogg file. - New telecomms bus mainframe sprite, thanks to WJohnston. - New holdable shield, sprites courtesy of Muncher (i had to mangle the side sprites because of a technical little issue. I'll change it back to the original soon). It can be retracted and expanded. Probably only going to be given to traitors. - A couple of minor bugfixes here and there, along with some code tidying. Hope this isn't too large a commit. I intended it to be MUCH larger, but I've decided to split up my Traitor Factions expansion into smaller commits. Revision: r3692 Author: vageyenaman
138 lines
3.6 KiB
Plaintext
138 lines
3.6 KiB
Plaintext
|
|
/obj/effect/new_year_tree
|
|
name = "The fir"
|
|
desc = "This is a fir. Real fir on dammit spess station. You smell pine-needles."
|
|
icon = '160x160.dmi'
|
|
icon_state = "new-year-tree"
|
|
anchored = 1
|
|
opacity = 1
|
|
density = 1
|
|
layer = 5
|
|
pixel_x = -64
|
|
//pixel_y = -64
|
|
|
|
/obj/effect/new_year_tree/attackby(obj/item/W, mob/user)
|
|
if (istype(W, /obj/item/weapon/grab))
|
|
return
|
|
W.loc = src
|
|
if (user.client)
|
|
user.client.screen -= W
|
|
user.u_equip(W)
|
|
var/const/bottom_right_x = 115.0
|
|
var/const/bottom_right_y = 150.0
|
|
var/const/top_left_x = 15.0
|
|
var/const/top_left_y = 15.0
|
|
var/const/bottom_med_x = top_left_x+(bottom_right_x-top_left_x)/2
|
|
var/x = rand(top_left_x,bottom_med_x) //point in half of circumscribing rectangle
|
|
var/y = rand(top_left_y,bottom_right_y)
|
|
/*
|
|
y1=a*x1+b
|
|
y2=a*x2+b b = y2-a*x2
|
|
|
|
y1=a*x1+ y2-a*x2
|
|
a*(x1-x2)+y2-y1=0
|
|
a = (y1-y2)/(x1-x2)
|
|
*/
|
|
var/a = (top_left_y-bottom_right_y)/(top_left_x-bottom_med_x)
|
|
var/b = bottom_right_y-a*bottom_med_x
|
|
|
|
if (a*x+b < y) //if point is above diagonal top_left -> bottom_median
|
|
x = bottom_med_x + x - top_left_x
|
|
y = bottom_right_y - y + top_left_y
|
|
var/image/I = image(W.icon, W, icon_state = W.icon_state)
|
|
I.pixel_x = x
|
|
I.pixel_y = y
|
|
overlays += I
|
|
|
|
/obj/item/weapon/firbang
|
|
desc = "It is set to detonate in 10 seconds."
|
|
name = "firbang"
|
|
icon = 'grenade.dmi'
|
|
icon_state = "flashbang"
|
|
var/state = null
|
|
var/det_time = 100.0
|
|
w_class = 2.0
|
|
item_state = "flashbang"
|
|
throw_speed = 4
|
|
throw_range = 20
|
|
flags = FPRINT | TABLEPASS | CONDUCT
|
|
slot_flags = SLOT_BELT
|
|
|
|
/obj/item/weapon/firbang/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
|
|
if (user.equipped() == src)
|
|
if ((CLUMSY in usr.mutations) && prob(50))
|
|
user << "\red Huh? How does this thing work?!"
|
|
src.state = 1
|
|
src.icon_state = "flashbang1"
|
|
playsound(src.loc, 'armbomb.ogg', 75, 1, -3)
|
|
spawn( 5 )
|
|
prime()
|
|
return
|
|
else if (!( src.state ))
|
|
user << "\red You prime the [src]! [det_time/10] seconds!"
|
|
src.state = 1
|
|
src.icon_state = "flashbang1"
|
|
playsound(src.loc, 'armbomb.ogg', 75, 1, -3)
|
|
spawn( src.det_time )
|
|
prime()
|
|
return
|
|
user.dir = get_dir(user, target)
|
|
user.drop_item()
|
|
var/t = (isturf(target) ? target : target.loc)
|
|
walk_towards(src, t, 3)
|
|
src.add_fingerprint(user)
|
|
return
|
|
|
|
/obj/item/weapon/firbang/attack_paw(mob/user as mob)
|
|
return src.attack_hand(user)
|
|
|
|
/obj/item/weapon/firbang/attack_hand()
|
|
walk(src, null, null)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/firbang/proc/prime()
|
|
playsound(src.loc, 'bang.ogg', 25, 1)
|
|
var/turf/T = get_turf(src)
|
|
if(T)
|
|
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
|
|
smoke.set_up(3, 0, src.loc)
|
|
smoke.attach(src)
|
|
smoke.start()
|
|
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
|
s.set_up(3, 1, src)
|
|
s.start()
|
|
new /obj/effect/new_year_tree(T)
|
|
del(src)
|
|
return
|
|
|
|
/obj/item/weapon/firbang/attack_self(mob/user as mob)
|
|
if (!src.state)
|
|
if (CLUMSY in user.mutations)
|
|
user << "\red Huh? How does this thing work?!"
|
|
spawn( 5 )
|
|
prime()
|
|
return
|
|
else
|
|
user << "\red You prime the [src]! [det_time/10] seconds!"
|
|
src.state = 1
|
|
src.icon_state = "flashbang1"
|
|
add_fingerprint(user)
|
|
spawn( src.det_time )
|
|
prime()
|
|
return
|
|
return
|
|
|
|
/*
|
|
/datum/supply_packs/new_year
|
|
name = "New Year Celebration Equipment"
|
|
contains = list("/obj/item/weapon/firbang",
|
|
"/obj/item/weapon/firbang",
|
|
"/obj/item/weapon/firbang",
|
|
"/obj/item/weapon/wrapping_paper",
|
|
"/obj/item/weapon/wrapping_paper",
|
|
"/obj/item/weapon/wrapping_paper")
|
|
cost = 20
|
|
containertype = "/obj/structure/closet/crate"
|
|
containername = "New Year Celebration crate"
|
|
*/ |