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

fixes merge conflicts with weapon removals

Browse Source
This commit is contained in:
Kyep
2018-04-26 00:09:18 -07:00
parent 08fdc2bce3
commit c3f271449e
7 changed files with 887 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/z6.dmm
+831 -832
View File
File diff suppressed because it is too large Load Diff
code/game/objects/effects/spawners/random_spawners.dm
+40 -42
View File
@@ -164,7 +164,7 @@
spawn_nothing_percentage = 0
result = list(
/obj/item/pizzabox/meat = 1,
/obj/item/device/pizza_bomb/autoarm = 1
/obj/item/pizza_bomb/autoarm = 1
)
/obj/effect/spawner/random_spawners/syndicate/trap/medbot
@@ -177,8 +177,6 @@
/obj/effect/spawner/random_spawners/syndicate/trap/mine
name = "50pc trap landmine"
icon = 'icons/obj/weapons.dmi'
icon_state = "uglyminearmed"
result = list(
/obj/effect/mine/explosive = 1
)
@@ -188,8 +186,8 @@
icon_state = "folder_syellow"
spawn_nothing_percentage = 0
result = list(
/obj/item/weapon/folder/syndicate/yellow = 1,
/obj/item/weapon/folder/syndicate/yellow_trapped = 1
/obj/item/folder/syndicate/yellow = 1,
/obj/item/folder/syndicate/yellow_trapped = 1
)
@@ -202,17 +200,17 @@
icon_state = "1"
// Loot schema: costumes, toys, useless gimmick items, trapped items
result = list(
/obj/item/weapon/storage/toolbox/syndicate = 1,
/obj/item/weapon/storage/toolbox/syndicate/trapped = 1,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate = 1,
/obj/item/storage/toolbox/syndicate = 1,
/obj/item/storage/toolbox/syndicate/trapped = 1,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
/obj/item/toy/cards/deck/syndicate = 1,
/obj/item/weapon/storage/secure/briefcase/syndie = 1,
/obj/item/storage/secure/briefcase/syndie = 1,
/obj/item/toy/syndicateballoon = 1,
/obj/item/weapon/soap/syndie = 1,
/obj/item/soap/syndie = 1,
/obj/item/clothing/under/syndicate = 1,
/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/mask/gas/syndicate = 1,
/obj/item/weapon/storage/box/syndie_kit/cutouts = 1,
/obj/item/storage/box/syndie_kit/cutouts = 1,
)
/obj/effect/spawner/random_spawners/syndicate/loot/spawn_item(var/turf/T)
@@ -231,17 +229,17 @@
icon_state = "2"
// Loot schema: space gear, basic armor, basic ammo (10mm, rcd), drugs, more dangerous/useful gimmick items, lower-value minerals
result = list(
/obj/item/weapon/storage/box/syndie_kit/space = 1,
/obj/item/weapon/storage/box/syndie_kit/hardsuit = 1,
/obj/item/storage/box/syndie_kit/space = 1,
/obj/item/storage/box/syndie_kit/hardsuit = 1,
/obj/item/clothing/shoes/magboots/syndie = 1,
/obj/item/clothing/suit/armor/vest/combat = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/weapon/storage/pill_bottle/happy = 1,
/obj/item/weapon/storage/pill_bottle/zoom = 1,
/obj/item/weapon/storage/pill_bottle/random_drug_bottle = 2,
/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/clothing/shoes/syndigaloshes = 1,
/obj/item/weapon/rcd_ammo = 1,
/obj/item/weapon/stamp/chameleon = 1,
/obj/item/rcd_ammo = 1,
/obj/item/stamp/chameleon = 1,
/obj/item/flag/chameleon = 1,
/obj/item/stack/sheet/mineral/plasma = 1,
/obj/item/stack/sheet/mineral/silver = 1,
@@ -252,25 +250,25 @@
icon_state = "3"
// Loot schema: medkits, very useful devices (jammer, illegal upgrade, RCD), better quality ammo (AP, fire), basic weapons (pistol, empgrenade), high value ores (diamond, uranium)
result = list(
/obj/item/device/jammer = 1,
/obj/item/weapon/storage/firstaid = 1,
/obj/item/weapon/storage/firstaid/tactical = 1,
/obj/item/weapon/gun/projectile/automatic/pistol = 1,
/obj/item/weapon/stock_parts/cell/bluespace = 1,
/obj/item/jammer = 1,
/obj/item/storage/firstaid = 1,
/obj/item/storage/firstaid/tactical = 1,
/obj/item/gun/projectile/automatic/pistol = 1,
/obj/item/stock_parts/cell/bluespace = 1,
/obj/item/borg/upgrade/vtec = 1,
/obj/item/borg/upgrade/syndicate = 1,
/obj/item/borg/upgrade/selfrepair = 1,
/obj/item/stack/sheet/mineral/diamond = 1,
/obj/item/stack/sheet/mineral/uranium = 1,
/obj/item/weapon/rcd = 1,
/obj/item/rcd = 1,
/obj/item/clothing/shoes/magboots/syndie/advance = 1,
/obj/item/weapon/grenade/empgrenade = 1,
/obj/item/weapon/grenade/spawnergrenade/feral_cats = 1,
/obj/item/grenade/empgrenade = 1,
/obj/item/grenade/spawnergrenade/feral_cats = 1,
/obj/item/ammo_box/magazine/m10mm/ap = 1,
/obj/item/ammo_box/magazine/m10mm/fire = 1,
/obj/item/weapon/storage/box/syndie_kit/throwing_weapons = 1,
/obj/item/weapon/gun/syringe/syndicate = 1,
/obj/item/weapon/suppressor = 1,
/obj/item/storage/box/syndie_kit/throwing_weapons = 1,
/obj/item/gun/syringe/syndicate = 1,
/obj/item/suppressor = 1,
/obj/item/clothing/glasses/hud/security/chameleon = 1
)
/obj/effect/spawner/random_spawners/syndicate/loot/level4
@@ -279,21 +277,21 @@
// Loot schema: high-power weapons (m90, esword, ebow, revolver), devices that negate depot challenges (thermal glasses, chameleon device), explosives
result = list(
/obj/item/clothing/glasses/thermal = 1,
/obj/item/weapon/gun/projectile/automatic/m90 = 1,
/obj/item/gun/projectile/automatic/m90 = 1,
/obj/item/ammo_box/magazine/m556 = 1,
/obj/item/device/chameleon = 1,
/obj/item/device/radio/headset/syndicate = 1,
/obj/item/weapon/grenade/spawnergrenade/manhacks = 1,
/obj/item/weapon/melee/energy/sword/saber = 1,
/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow = 1,
/obj/item/weapon/gun/projectile/revolver = 1,
/obj/item/weapon/grenade/plastic/x4 = 1,
/obj/item/chameleon = 1,
/obj/item/radio/headset/syndicate = 1,
/obj/item/grenade/spawnergrenade/manhacks = 1,
/obj/item/melee/energy/sword/saber = 1,
/obj/item/gun/energy/kinetic_accelerator/crossbow = 1,
/obj/item/gun/projectile/revolver = 1,
/obj/item/grenade/plastic/x4 = 1,
/obj/item/clothing/gloves/color/yellow/power = 1,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/stimulants = 1,
/obj/item/weapon/gun/projectile/automatic/c20r = 1,
/obj/item/weapon/twohanded/chainsaw = 1,
/obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades = 1,
/obj/item/weapon/grenade/syndieminibomb = 1,
/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
/obj/item/gun/projectile/automatic/c20r = 1,
/obj/item/twohanded/chainsaw = 1,
/obj/item/storage/box/syndie_kit/atmosgasgrenades = 1,
/obj/item/grenade/syndieminibomb = 1,
)
code/game/objects/items/devices/pizza_bomb.dm
+1 -1
View File
@@ -100,6 +100,6 @@
..()
correct_wire = pick(wires)
/obj/item/device/pizza_bomb/autoarm
/obj/item/pizza_bomb/autoarm
timer_set = 1
timer = 10
code/game/objects/items/weapons/grenades/custom_grenades.dm
+2 -2
View File
@@ -159,9 +159,9 @@
..()
CreateDefaultTrigger(/obj/item/assembly/mousetrap)
/obj/item/weapon/grenade/chem_grenade/explosion/mine_armed/New()
/obj/item/grenade/chem_grenade/explosion/mine_armed/New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/mousetrap/armed)
CreateDefaultTrigger(/obj/item/assembly/mousetrap/armed)
// Water + Potassium = Boom
code/game/objects/items/weapons/storage/toolbox.dm
+1 -1
View File
@@ -89,7 +89,7 @@
/obj/item/storage/toolbox/syndicate/trapped/New()
..()
new /obj/item/weapon/grenade/chem_grenade/explosion/mine_armed(src)
new /obj/item/grenade/chem_grenade/explosion/mine_armed(src)
/obj/item/storage/toolbox/drone
code/modules/mob/living/simple_animal/bot/syndicate.dm
+7 -10
View File
@@ -158,16 +158,13 @@
/mob/living/simple_animal/bot/ed209/syndicate/explode()
walk_to(src,0)
if(!qdeleted(src))
visible_message("<span class='userdanger'>[src] blows apart!</span>")
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/blood/oil(loc)
new /obj/effect/decal/mecha_wreckage/gygax/dark(loc)
raise_alert("[src] destroyed.")
qdel(src)
visible_message("<span class='userdanger'>[src] blows apart!</span>")
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/blood/oil(loc)
new /obj/effect/decal/mecha_wreckage/gygax/dark(loc)
raise_alert("[src] destroyed.")
/mob/living/simple_animal/bot/ed209/syndicate/set_weapon()
projectile = /obj/item/projectile/bullet/a40mm
code/modules/paperwork/folders.dm
+5 -5
View File
@@ -122,20 +122,20 @@
new /obj/item/documents/syndicate/blue(src)
update_icon()
/obj/item/weapon/folder/syndicate/yellow
/obj/item/folder/syndicate/yellow
icon_state = "folder_syellow"
/obj/item/weapon/folder/syndicate/yellow/New()
/obj/item/folder/syndicate/yellow/New()
..()
new /obj/item/documents/syndicate/yellow(src)
update_icon()
/obj/item/weapon/folder/syndicate/yellow_trapped
/obj/item/folder/syndicate/yellow_trapped
icon_state = "folder_syellow"
/obj/item/weapon/folder/syndicate/yellow_trapped/New()
/obj/item/folder/syndicate/yellow_trapped/New()
..()
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
var/obj/item/paper/P = new /obj/item/paper(src)
P.name = "'Yellow' secret documents"
P.info = "Death to NanoTrasen!"
P.contact_poison = "amanitin"