petethegoat@gmail.com
8ff7285645
The main goal was to remove all the pointless shit in the UI style dmis, but this commit actually goes a bit deeper than that. Formally renames the "hurt" intent to "harm", in line with everything else in the world. Removes the old screen1_... .dmis. They've been replaced with screen_... .dmis. They function much the same. screen_gen.dmi is used for things which apply to multiple UI styles, such as storage slot sprites, or the intent selector. (These can still be overridden in HUD code, though.) Item action buttons have been changed to use a template from the UI style, and the icon_state of the item. var/icon_action_button has been removed- varvar/action_button_name must be used instead to add action buttons for items. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5826 316c924e-a436-60f5-8080-3fe189b3f50e
204 lines
4.8 KiB
Plaintext
204 lines
4.8 KiB
Plaintext
/* The old single tank bombs that dont really work anymore
|
|
/obj/effect/spawner/bomb
|
|
name = "bomb"
|
|
icon = 'icons/mob/screen_gen.dmi'
|
|
icon_state = "x"
|
|
var/btype = 0 //0 = radio, 1= prox, 2=time
|
|
var/explosive = 1 // 0= firebomb
|
|
var/btemp = 500 // bomb temperature (degC)
|
|
var/active = 0
|
|
|
|
/obj/effect/spawner/bomb/radio
|
|
btype = 0
|
|
|
|
/obj/effect/spawner/bomb/proximity
|
|
btype = 1
|
|
|
|
/obj/effect/spawner/bomb/timer
|
|
btype = 2
|
|
|
|
/obj/effect/spawner/bomb/timer/syndicate
|
|
btemp = 450
|
|
|
|
/obj/effect/spawner/bomb/suicide
|
|
btype = 3
|
|
|
|
/obj/effect/spawner/bomb/New()
|
|
..()
|
|
|
|
switch (src.btype)
|
|
// radio
|
|
if (0)
|
|
var/obj/item/assembly/r_i_ptank/R = new /obj/item/assembly/r_i_ptank(src.loc)
|
|
var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R)
|
|
var/obj/item/device/radio/signaler/p1 = new /obj/item/device/radio/signaler(R)
|
|
var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
|
|
R.part1 = p1
|
|
R.part2 = p2
|
|
R.part3 = p3
|
|
p1.master = R
|
|
p2.master = R
|
|
p3.master = R
|
|
R.status = explosive
|
|
p1.b_stat = 0
|
|
p2.secured = 1
|
|
p3.air_contents.temperature = btemp + T0C
|
|
|
|
// proximity
|
|
if (1)
|
|
var/obj/item/assembly/m_i_ptank/R = new /obj/item/assembly/m_i_ptank(src.loc)
|
|
var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R)
|
|
var/obj/item/device/prox_sensor/p1 = new /obj/item/device/prox_sensor(R)
|
|
var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
|
|
R.part1 = p1
|
|
R.part2 = p2
|
|
R.part3 = p3
|
|
p1.master = R
|
|
p2.master = R
|
|
p3.master = R
|
|
R.status = explosive
|
|
|
|
p3.air_contents.temperature = btemp + T0C
|
|
p2.secured = 1
|
|
|
|
if(src.active)
|
|
R.part1.secured = 1
|
|
R.part1.icon_state = text("motion[]", 1)
|
|
R.c_state(1, src)
|
|
|
|
// timer
|
|
if (2)
|
|
var/obj/item/assembly/t_i_ptank/R = new /obj/item/assembly/t_i_ptank(src.loc)
|
|
var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R)
|
|
var/obj/item/device/timer/p1 = new /obj/item/device/timer(R)
|
|
var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
|
|
R.part1 = p1
|
|
R.part2 = p2
|
|
R.part3 = p3
|
|
p1.master = R
|
|
p2.master = R
|
|
p3.master = R
|
|
R.status = explosive
|
|
|
|
p3.air_contents.temperature = btemp + T0C
|
|
p2.secured = 1
|
|
//bombvest
|
|
if(3)
|
|
var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc)
|
|
var/obj/item/weapon/tank/plasma/p4 = new /obj/item/weapon/tank/plasma(R)
|
|
var/obj/item/device/healthanalyzer/p1 = new /obj/item/device/healthanalyzer(R)
|
|
var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
|
|
var/obj/item/clothing/suit/armor/vest/p3 = new /obj/item/clothing/suit/armor/vest(R)
|
|
R.part1 = p1
|
|
R.part2 = p2
|
|
R.part3 = p3
|
|
R.part4 = p4
|
|
p1.master = R
|
|
p2.master = R
|
|
p3.master = R
|
|
p4.master = R
|
|
R.status = explosive
|
|
|
|
p4.air_contents.temperature = btemp + T0C
|
|
p2.secured = 1
|
|
|
|
del(src)
|
|
*/
|
|
|
|
/obj/effect/spawner/newbomb
|
|
name = "bomb"
|
|
icon = 'icons/mob/screen_gen.dmi'
|
|
icon_state = "x"
|
|
var/btype = 0 // 0=radio, 1=prox, 2=time
|
|
var/btemp1 = 1500
|
|
var/btemp2 = 1000 // tank temperatures
|
|
|
|
timer
|
|
btype = 2
|
|
|
|
syndicate
|
|
btemp1 = 150
|
|
btemp2 = 20
|
|
|
|
proximity
|
|
btype = 1
|
|
|
|
radio
|
|
btype = 0
|
|
|
|
|
|
/obj/effect/spawner/newbomb/New()
|
|
..()
|
|
|
|
switch (src.btype)
|
|
// radio
|
|
if (0)
|
|
|
|
var/obj/item/device/transfer_valve/V = new(src.loc)
|
|
var/obj/item/weapon/tank/plasma/PT = new(V)
|
|
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
|
|
|
var/obj/item/device/assembly/signaler/S = new(V)
|
|
|
|
V.tank_one = PT
|
|
V.tank_two = OT
|
|
V.attached_device = S
|
|
|
|
S.holder = V
|
|
S.toggle_secure()
|
|
PT.master = V
|
|
OT.master = V
|
|
|
|
PT.air_contents.temperature = btemp1 + T0C
|
|
OT.air_contents.temperature = btemp2 + T0C
|
|
|
|
V.update_icon()
|
|
|
|
// proximity
|
|
if (1)
|
|
|
|
var/obj/item/device/transfer_valve/V = new(src.loc)
|
|
var/obj/item/weapon/tank/plasma/PT = new(V)
|
|
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
|
|
|
var/obj/item/device/assembly/prox_sensor/P = new(V)
|
|
|
|
V.tank_one = PT
|
|
V.tank_two = OT
|
|
V.attached_device = P
|
|
|
|
P.holder = V
|
|
P.toggle_secure()
|
|
PT.master = V
|
|
OT.master = V
|
|
|
|
|
|
PT.air_contents.temperature = btemp1 + T0C
|
|
OT.air_contents.temperature = btemp2 + T0C
|
|
|
|
V.update_icon()
|
|
|
|
|
|
// timer
|
|
if (2)
|
|
var/obj/item/device/transfer_valve/V = new(src.loc)
|
|
var/obj/item/weapon/tank/plasma/PT = new(V)
|
|
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
|
|
|
var/obj/item/device/assembly/timer/T = new(V)
|
|
|
|
V.tank_one = PT
|
|
V.tank_two = OT
|
|
V.attached_device = T
|
|
|
|
T.holder = V
|
|
T.toggle_secure()
|
|
PT.master = V
|
|
OT.master = V
|
|
T.time = 30
|
|
|
|
PT.air_contents.temperature = btemp1 + T0C
|
|
OT.air_contents.temperature = btemp2 + T0C
|
|
|
|
V.update_icon()
|
|
del(src) |