cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-28 23:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cargo, more turret fixes

Browse Source 
Re-adds orderable headset chips.  It got wiped in the big bay update
that ruined everything.

Updates turret electrodes to electrode/high, like everything else in the
game.  yes.
This commit is contained in:
Duck-
2014-09-19 14:21:41 -04:00
parent 17c2f2709a
commit cf06d71b1c
3 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
+91 -11
View File
@@ -724,17 +724,15 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/shotgunammo
name = "Shotgun shells"
contains = list(/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun)
cost = 20
contains = list(/obj/item/ammo_magazine/shotgun,
/obj/item/ammo_magazine/shotgun,
/obj/item/ammo_magazine/shotgun,
/obj/item/ammo_magazine/shotgun,
/obj/item/ammo_magazine/shotgun/beanbag,
/obj/item/ammo_magazine/shotgun/beanbag,
/obj/item/ammo_magazine/shotgun/incendiary,
/obj/item/ammo_magazine/shotgun/incendiary)
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Shotgun shells"
access = access_armory
@@ -1112,6 +1110,88 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
access = access_hydroponics
group = "Hydroponics"
//My foray into encryption key crates. - Duck
/datum/supply_packs/sec_keys
name = "Security Encryption Keys"
contains = list(/obj/item/device/encryptionkey/headset_sec,
/obj/item/device/encryptionkey/headset_sec,
/obj/item/device/encryptionkey/headset_sec,
/obj/item/device/encryptionkey/headset_sec,
/obj/item/device/encryptionkey/headset_sec)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "Security Encryption Keys"
group = "Operations"
access = access_security
/datum/supply_packs/sci_keys
name = "Science Encryption Keys"
contains = list(/obj/item/device/encryptionkey/headset_sci,
/obj/item/device/encryptionkey/headset_sci,
/obj/item/device/encryptionkey/headset_sci,
/obj/item/device/encryptionkey/headset_sci,
/obj/item/device/encryptionkey/headset_sci)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "Science Encryption Keys"
group = "Operations"
access = access_research
/datum/supply_packs/eng_keys
name = "Engineering Encryption Keys"
contains = list(/obj/item/device/encryptionkey/headset_eng,
/obj/item/device/encryptionkey/headset_eng,
/obj/item/device/encryptionkey/headset_eng,
/obj/item/device/encryptionkey/headset_eng,
/obj/item/device/encryptionkey/headset_eng)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "Engineering Encryption Keys"
group = "Operations"
access = access_engine
/datum/supply_packs/med_keys
name = "Medical Encryption Keys"
contains = list(/obj/item/device/encryptionkey/headset_med,
/obj/item/device/encryptionkey/headset_med,
/obj/item/device/encryptionkey/headset_med,
/obj/item/device/encryptionkey/headset_med,
/obj/item/device/encryptionkey/headset_med)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "Medical Encryption Keys"
group = "Operations"
access = access_medical
/datum/supply_packs/cargo_keys
name = "Cargo Encryption Keys"
contains = list(/obj/item/device/encryptionkey/headset_cargo,
/obj/item/device/encryptionkey/headset_cargo,
/obj/item/device/encryptionkey/headset_cargo,
/obj/item/device/encryptionkey/headset_cargo,
/obj/item/device/encryptionkey/headset_cargo)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "Cargo Encryption Keys"
group = "Operations"
access = access_cargo
/datum/supply_packs/head_keys
name = "Head Encryption Keys"
contains = list(/obj/item/device/encryptionkey/heads/captain,
/obj/item/device/encryptionkey/heads/rd,
/obj/item/device/encryptionkey/heads/hos,
/obj/item/device/encryptionkey/heads/ce,
/obj/item/device/encryptionkey/heads/cmo,
/obj/item/device/encryptionkey/heads/hop)
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "Head Encryption Keys"
group = "Operations"
access = access_heads
/*
*Skull's additions to satisfy the cravings of any atmospheric tech begin here.
*/
code/game/machinery/portable_turret.dm
+4 -4
View File
@@ -66,7 +66,7 @@
spark_system.attach(src)
sleep(10)
if(!installation)// if for some reason the turret has no gun (ie, admin spawned) it resorts to basic taser shots
projectile = /obj/item/projectile/energy/electrode//holder for the projectile, here it is being set
projectile = /obj/item/projectile/energy/electrode/high//holder for the projectile, here it is being set
eprojectile = /obj/item/projectile/beam//holder for the projectile when emagged, if it is different
reqpower = 200
sound = 1
@@ -128,13 +128,13 @@
reqpower = 700
if(/obj/item/weapon/gun/energy/taser)
projectile = /obj/item/projectile/energy/electrode
projectile = /obj/item/projectile/energy/electrode/high
eprojectile = projectile
iconholder = 1
reqpower = 200
if(/obj/item/weapon/gun/energy/stunrevolver)
projectile = /obj/item/projectile/energy/electrode
projectile = /obj/item/projectile/energy/electrode/high
eprojectile = projectile
iconholder = 1
reqpower = 200
@@ -176,7 +176,7 @@
reqpower = 500
else // Energy gun shots
projectile = /obj/item/projectile/energy/electrode// if it hasn't been emagged, it uses normal taser shots
projectile = /obj/item/projectile/energy/electrode/high// if it hasn't been emagged, it uses normal taser shots
eprojectile = /obj/item/projectile/beam//If it has, going to kill mode
iconholder = 1
egun = 1
code/game/machinery/turrets.dm
+1 -1
View File
@@ -233,7 +233,7 @@
A.original = target
use_power(500)
else
A = new /obj/item/projectile/energy/electrode( loc )
A = new /obj/item/projectile/energy/electrode/high( loc )
use_power(200)
A.current = T
A.yo = U.y - T.y