mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 14:39:58 +01:00
Lopland Security and Armadyne Weaponry rework [Security Medic and Sergeant] [RFT] (#2860)
* REMOVE BATONG * Stage 2 emitters * aaa * aaaa * Climb up and start the rotors * the DOORS MASON * Stage 3 emitters * a * a * Update belt.dm * aaaa * more clothes * update, wintercoat! * Update wardrobes.dm * Update wardrobes.dm * test * Better * STAGE-4 BOIS * No wait, it's stage 5 * aaa * gunsets and tokens! * hot backend stuff * Fixes * aaa * QUICKDRAW! * The smartgun * a * a * a * Map changes * a * Merge branch 'master' into thesecining * Merge branch 'master' into thesecining * PHASE 6 LADS, IT'S DONE! * Merge branch 'master' into thesecining * smartgun delay * New HUD and ID cards + EMP protection system * Create readme.md * flashlight * clof * Update master.dm * 6.5 * armadyne * SECURITY SERGEANT AND MANY TWEAKS * Update security.dm * a * Update jobs.txt * Update security_sergeant.dm * Report to! * Update guns.dm * Merge branch 'master' into thesecining * redesign * Update MetaStation_skyrat.dmm * Update KiloStation_skyrat.dmm * Update decals.dm * It's nearly done lads. * corpo * a * Update ammo.dm * a * Update bullets.dm * fuxes * Update shields.dm * a * Update guns.dm * Bullet drive + fixes * Update gunsets.dm * Update bulletdrive.dmi * Update hud.dmi * fix * fs * a * . * Update bullets.dm * aaa * Update bullets.dm * Update tgstation.dme * bulletbot * Update bulletbot.dm * a * oops * fixes * aaaa * Update vending.dmi * a * seclock * aaa * a * a * a * Update ammoboxes.dmi * fixesa * a * Update guns.dm * a * Update guns.dm * Peacekeeper hardsuit * a * a * aaa * Update peacekeeper_clothing.dm * couple fixes * Merge branch 'master' into thesecining * hitscan laser gun * a * Merge branch 'master' into thesecining * a * a
This commit is contained in:
@@ -283,6 +283,7 @@
|
||||
/obj/item/clothing/suit/armor/vest)
|
||||
crate_name = "armor crate"
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL - SEC_HAUL
|
||||
/datum/supply_pack/security/disabler
|
||||
name = "Disabler Crate"
|
||||
desc = "Three stamina-draining disabler weapons. Requires Security access to open."
|
||||
@@ -292,6 +293,7 @@
|
||||
/obj/item/gun/energy/disabler,
|
||||
/obj/item/gun/energy/disabler)
|
||||
crate_name = "disabler crate"
|
||||
*/
|
||||
|
||||
/datum/supply_pack/security/forensics
|
||||
name = "Forensics Crate"
|
||||
@@ -315,6 +317,7 @@
|
||||
/obj/item/clothing/head/helmet/sec)
|
||||
crate_name = "helmet crate"
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL - SEC_HAUL
|
||||
/datum/supply_pack/security/laser
|
||||
name = "Lasers Crate"
|
||||
desc = "Contains three lethal, high-energy laser guns. Requires Security access to open."
|
||||
@@ -324,7 +327,7 @@
|
||||
/obj/item/gun/energy/laser,
|
||||
/obj/item/gun/energy/laser)
|
||||
crate_name = "laser crate"
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/datum/supply_pack/security/securitybarriers
|
||||
@@ -338,6 +341,7 @@
|
||||
cost = CARGO_CRATE_VALUE * 2
|
||||
crate_name = "security barriers crate"
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL - SEC_HUAL
|
||||
/datum/supply_pack/security/securityclothes
|
||||
name = "Security Clothing Crate"
|
||||
desc = "Contains appropriate outfits for the station's private security force. Contains outfits for the Warden, Head of Security, and two Security Officers. Each outfit comes with a rank-appropriate jumpsuit, suit, and beret. Requires Security access to open."
|
||||
@@ -356,6 +360,7 @@
|
||||
/obj/item/clothing/suit/security/hos,
|
||||
/obj/item/clothing/head/beret/sec/navyhos)
|
||||
crate_name = "security clothing crate"
|
||||
*/
|
||||
|
||||
/datum/supply_pack/security/stingpack
|
||||
name = "Stingbang Grenade Pack"
|
||||
@@ -406,7 +411,7 @@
|
||||
/datum/supply_pack/security/baton
|
||||
name = "Stun Batons Crate"
|
||||
desc = "Arm the Civil Protection Forces with three stun batons. Batteries included. Requires Security access to open."
|
||||
cost = CARGO_CRATE_VALUE * 2
|
||||
cost = CARGO_CRATE_VALUE * 15 //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: 2
|
||||
access_view = ACCESS_SECURITY
|
||||
contains = list(/obj/item/melee/baton/loaded,
|
||||
/obj/item/melee/baton/loaded,
|
||||
@@ -499,6 +504,7 @@
|
||||
/obj/item/gun/energy/e_gun/dragnet)
|
||||
crate_name = "\improper DRAGnet crate"
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL - SEC_HUAL
|
||||
/datum/supply_pack/security/armory/energy
|
||||
name = "Energy Guns Crate"
|
||||
desc = "Contains two Energy Guns, capable of firing both nonlethal and lethal blasts of light. Requires Armory access to open."
|
||||
@@ -507,6 +513,7 @@
|
||||
/obj/item/gun/energy/e_gun)
|
||||
crate_name = "energy gun crate"
|
||||
crate_type = /obj/structure/closet/crate/secure/plasma
|
||||
*/
|
||||
|
||||
/datum/supply_pack/security/armory/exileimp
|
||||
name = "Exile Implants Crate"
|
||||
@@ -2632,6 +2639,7 @@
|
||||
contains = list(/obj/item/vending_refill/cart)
|
||||
crate_name = "ptech supply crate"
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL - SEC_HAUL - MOVED TO PACKS.DM
|
||||
/datum/supply_pack/vending/sectech
|
||||
name = "SecTech Supply Crate"
|
||||
desc = "Officer Paul bought all the donuts? Then refill the security vendor with ths crate."
|
||||
@@ -2640,6 +2648,7 @@
|
||||
contains = list(/obj/item/vending_refill/security)
|
||||
crate_name = "SecTech supply crate"
|
||||
crate_type = /obj/structure/closet/crate/secure/gear
|
||||
*/
|
||||
|
||||
/datum/supply_pack/vending/snack
|
||||
name = "Snack Supply Crate"
|
||||
@@ -2724,6 +2733,7 @@
|
||||
/obj/item/vending_refill/wardrobe/science_wardrobe)
|
||||
crate_name = "science department wardrobe supply crate"
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL - SEC_HAUL - MOVED TO PACKS.DM
|
||||
/datum/supply_pack/vending/wardrobes/security
|
||||
name = "Security Wardrobe Supply Crate"
|
||||
desc = "This crate contains refills for the SecDrobe and LawDrobe."
|
||||
@@ -2731,3 +2741,4 @@
|
||||
contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe,
|
||||
/obj/item/vending_refill/wardrobe/law_wardrobe)
|
||||
crate_name = "security department supply crate"
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user