cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds a new heavy weight space pirate variant: The space IRS! [MDB IGNORE] (#22365)

Browse Source 
* Adds a new heavy weight space pirate variant: The space IRS!

* Fix merge conflicts, UpdatePaths

* Fixes some path changes

* Updates icon files, adds a new sprite for breacher slug box illustration

* Removes some skyrat edits and puts them in modular overrides instead

---------

Co-authored-by: Singul0 <127663818+Singul0@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
This commit is contained in:
SkyratBot
2023-07-15 03:39:23 -04:00
committed by GitHub
co-authored by Singul0 Giz
parent 0d0d7938f2
commit fd2c6fb35b
44 changed files with 2813 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs/imports.dm
+2 -2
View File
@@ -219,8 +219,8 @@
/obj/item/food/rationpack,
/obj/item/ammo_box/a762,
/obj/item/ammo_box/a762/surplus,
/obj/item/storage/toolbox/a762,
/obj/item/storage/toolbox/a762/surplus,
/obj/item/storage/toolbox/ammobox/a762,
/obj/item/storage/toolbox/ammobox/a762/surplus,
/obj/item/storage/toolbox/maint_kit,
/obj/item/clothing/suit/armor/vest/russian,
/obj/item/clothing/head/helmet/rus_helmet,
code/modules/cargo/packs/security.dm
+1 -33
View File
@@ -235,7 +235,7 @@
cost = CARGO_CRATE_VALUE * 5
contains = list(/obj/item/gun/energy/e_gun/dragnet = 3)
crate_name = "\improper DRAGnet crate"
// SKYRAT EDIT REMOVAL BEGIN - CARGO ARMAMENTS
/*
/datum/supply_pack/security/armory/energy
@@ -319,38 +319,6 @@
contains = list(/obj/item/shield/riot = 3)
crate_name = "riot shields crate"
/* SKYRAT EDIT REMOVAL START
/datum/supply_pack/security/armory/russian
name = "Russian Surplus Crate"
desc = "Hello Comrade, we have the most modern russian military equipment the \
black market can offer, for the right price of course. Sadly we couldn't remove \
the lock, so it"
cost = CARGO_CRATE_VALUE * 12
contraband = TRUE
contains = list(/obj/item/food/rationpack,
/obj/item/ammo_box/a762,
/obj/item/storage/toolbox/ammo,
/obj/item/storage/toolbox/maint_kit,
/obj/item/clothing/suit/armor/vest/russian,
/obj/item/clothing/head/helmet/rus_helmet,
/obj/item/clothing/shoes/russian,
/obj/item/clothing/gloves/tackler/combat,
/obj/item/clothing/under/syndicate/rus_army,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/head/helmet/rus_ushanka,
/obj/item/clothing/suit/armor/vest/russian_coat,
/obj/item/gun/ballistic/rifle/boltaction = 2,
)
crate_name = "surplus military crate"
/datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 10)
var/item = pick(contains)
new item(C)
*/ // SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/armory/swat
name = "SWAT Crate"
desc = "Contains two fullbody sets of tough, fireproof suits designed in a joint \