cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes 'n shit

Browse Source
This commit is contained in:
SamCroswell
2014-02-07 18:43:48 -05:00
parent bd26d1b0b7
commit be3c95a9ff
5 changed files with 3981 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
+9 -9
View File
@@ -49,23 +49,23 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/medical
default_cartridge = /obj/item/weapon/cartridge/medical
icon_state = "pda-m"
icon_state = "pda-medical"
/obj/item/device/pda/viro
default_cartridge = /obj/item/weapon/cartridge/medical
icon_state = "pda-v"
icon_state = "pda-virology"
/obj/item/device/pda/engineering
default_cartridge = /obj/item/weapon/cartridge/engineering
icon_state = "pda-e"
icon_state = "pda-engineer"
/obj/item/device/pda/security
default_cartridge = /obj/item/weapon/cartridge/security
icon_state = "pda-s"
icon_state = "pda-security"
/obj/item/device/pda/detective
default_cartridge = /obj/item/weapon/cartridge/detective
icon_state = "pda-det"
icon_state = "pda-security"
/obj/item/device/pda/warden
default_cartridge = /obj/item/weapon/cartridge/security
@@ -73,12 +73,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/janitor
default_cartridge = /obj/item/weapon/cartridge/janitor
icon_state = "pda-j"
icon_state = "pda-janitor"
ttone = "slip"
/obj/item/device/pda/toxins
default_cartridge = /obj/item/weapon/cartridge/signal/toxins
icon_state = "pda-tox"
icon_state = "pda-science"
ttone = "boom"
/obj/item/device/pda/clown
@@ -119,7 +119,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/captain
default_cartridge = /obj/item/weapon/cartridge/captain
icon_state = "pda-c"
icon_state = "pda-captain"
detonate = 0
//toff = 1
@@ -129,7 +129,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/quartermaster
default_cartridge = /obj/item/weapon/cartridge/quartermaster
icon_state = "pda-q"
icon_state = "pda-qm"
/obj/item/device/pda/shaftminer
icon_state = "pda-miner"
code/game/objects/structures/girders.dm
+3 -3
View File
@@ -178,7 +178,7 @@
bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj ,/obj/item/projectile/beam/pulse))
src.ex_act(1)
src.ex_act(2)
..()
return 0
@@ -193,13 +193,13 @@
qdel(src)
return
if(2.0)
if (prob(30))
if (prob(75))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
qdel(src)
return
if(3.0)
if (prob(5))
if (prob(30))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
qdel(src)