cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes certain Nuke Ops bundles using the wrong duffelbag sprite (#17717)

Browse Source 
* sprites updated

* removes redundant icon/item states
This commit is contained in:
AzuleUtama
2022-05-03 04:24:16 +01:00
committed by GitHub
parent a90e7e9bd2
commit 0f3133eb25
6 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/lootdrop.dm
+1 -1
View File
@@ -149,7 +149,7 @@
/obj/item/dnascrambler = 1,
/obj/item/storage/backpack/satchel_flat = 2,
/obj/item/storage/toolbox/syndicate = 2,
/obj/item/storage/backpack/duffel/syndie/surgery_fake = 2,
/obj/item/storage/backpack/duffel/syndie/med/surgery_fake = 2,
/obj/item/storage/belt/military/traitor = 2,
/obj/item/storage/box/syndie_kit/space = 2,
/obj/item/multitool/ai_detect = 2,
code/game/objects/effects/spawners/random_spawners.dm
+1 -1
View File
@@ -238,7 +238,7 @@
/obj/item/storage/pill_bottle/happy = 1,
/obj/item/storage/pill_bottle/zoom = 1,
/obj/item/storage/pill_bottle/random_drug_bottle = 2,
/obj/item/storage/backpack/duffel/syndie/surgery = 1,
/obj/item/storage/backpack/duffel/syndie/med/surgery = 1,
/obj/item/clothing/shoes/chameleon/noslip = 1,
/obj/item/storage/belt/military = 1,
/obj/item/clothing/under/chameleon = 1,
code/game/objects/items/weapons/storage/backpack.dm
+14 -22
View File
@@ -340,8 +340,8 @@
/obj/item/storage/backpack/duffel/syndie
name = "suspicious looking duffelbag"
desc = "A large duffelbag for holding extra tactical supplies."
icon_state = "duffel-syndimed"
item_state = "duffel-syndimed"
icon_state = "duffel-syndiammo"
item_state = "duffel-syndiammo"
origin_tech = "syndicate=1"
silent = TRUE
slowdown = 0
@@ -350,27 +350,23 @@
/obj/item/storage/backpack/duffel/syndie/med
name = "suspicious duffelbag"
desc = "A black and red duffelbag with a red and white cross sewn onto it."
icon_state = "duffel-syndimed"
item_state = "duffel-syndimed"
/obj/item/storage/backpack/duffel/syndie/ammo
name = "suspicious duffelbag"
desc = "A black and red duffelbag with a patch depicting shotgun shells sewn onto it."
icon_state = "duffel-syndiammo"
item_state = "duffel-syndiammo"
/obj/item/storage/backpack/duffel/syndie/ammo/shotgun
/obj/item/storage/backpack/duffel/syndie/shotgun
desc = "A large duffelbag, packed to the brim with Bulldog shotgun ammo."
/obj/item/storage/backpack/duffel/syndie/ammo/shotgun/populate_contents()
/obj/item/storage/backpack/duffel/syndie/shotgun/populate_contents()
for(var/i in 1 to 6)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/dragon(src)
/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags
/obj/item/storage/backpack/duffel/syndie/shotgunXLmags
desc = "A large duffelbag, containing three types of extended drum magazines."
/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags/populate_contents()
/obj/item/storage/backpack/duffel/syndie/shotgunXLmags/populate_contents()
new /obj/item/ammo_box/magazine/m12g/XtrLrg(src)
new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src)
@@ -393,10 +389,10 @@
new /obj/item/clothing/suit/hooded/explorer(src)
/obj/item/storage/backpack/duffel/syndie/ammo/smg
/obj/item/storage/backpack/duffel/syndie/smg
desc = "A large duffel bag, packed to the brim with C-20r magazines."
/obj/item/storage/backpack/duffel/syndie/ammo/smg/populate_contents()
/obj/item/storage/backpack/duffel/syndie/smg/populate_contents()
for(var/i in 1 to 10)
new /obj/item/ammo_box/magazine/smgm45(src)
@@ -435,13 +431,11 @@
for(var/i in 1 to 3)
new /obj/item/grenade/plastic/c4/x4(src)
/obj/item/storage/backpack/duffel/syndie/surgery
/obj/item/storage/backpack/duffel/syndie/med/surgery
name = "surgery duffelbag"
desc = "A suspicious looking duffelbag for holding surgery tools."
icon_state = "duffel-syndimed"
item_state = "duffel-syndimed"
/obj/item/storage/backpack/duffel/syndie/surgery/populate_contents()
/obj/item/storage/backpack/duffel/syndie/med/surgery/populate_contents()
new /obj/item/scalpel(src)
new /obj/item/hemostat(src)
new /obj/item/retractor(src)
@@ -454,13 +448,11 @@
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/mask/muzzle(src)
/obj/item/storage/backpack/duffel/syndie/surgery_fake //for maint spawns
/obj/item/storage/backpack/duffel/syndie/med/surgery_fake //for maint spawns
name = "surgery duffelbag"
desc = "A suspicious looking duffelbag for holding surgery tools."
icon_state = "duffel-syndimed"
item_state = "duffel-syndimed"
/obj/item/storage/backpack/duffel/syndie/surgery_fake/populate_contents()
/obj/item/storage/backpack/duffel/syndie/med/surgery_fake/populate_contents()
new /obj/item/scalpel(src)
new /obj/item/hemostat(src)
new /obj/item/retractor(src)