cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17245 from nullbear/c4-path

Browse Source 
Changes C4 Path and adds X4 breaching charge
This commit is contained in:
Jordie
2016-05-01 16:41:07 +10:00
parent ca8a610fcb e806e74000
commit f3f0c63e4f
17 changed files with 227 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/snowdin.dm
+1 -1
View File
@@ -124,7 +124,7 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
/obj/item/weapon/storage/firstaid/brute = 27,
/obj/item/weapon/storage/firstaid/fire = 27,
/obj/item/weapon/storage/toolbox/syndicate = 12,
/obj/item/weapon/c4 = 7,
/obj/item/weapon/grenade/plastic/c4 = 7,
/obj/item/weapon/grenade/clusterbuster/smoke = 15,
/obj/item/clothing/under/chameleon = 13,
/obj/item/clothing/shoes/chameleon = 10,
code/modules/clothing/outfits/standard.dm
+2 -2
View File
@@ -167,7 +167,7 @@
sec_briefcase.handle_item_insertion(new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow,1)
sec_briefcase.handle_item_insertion(new /obj/item/weapon/gun/projectile/revolver/mateba,1)
sec_briefcase.handle_item_insertion(new /obj/item/ammo_box/a357,1)
sec_briefcase.handle_item_insertion(new /obj/item/weapon/c4,1)
sec_briefcase.handle_item_insertion(new /obj/item/weapon/grenade/plastic/x4,1)
var/obj/item/device/pda/heads/pda = H.belt
pda.owner = H.real_name
@@ -347,7 +347,7 @@
/obj/item/weapon/storage/firstaid/regular=1,\
/obj/item/weapon/storage/box/flashbangs=1,\
/obj/item/device/flashlight=1,\
/obj/item/weapon/c4=1)
/obj/item/weapon/grenade/plastic/x4=1)
/datum/outfit/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
code/modules/crafting/recipes.dm
+5 -14
View File
@@ -31,7 +31,7 @@
category = CAT_WEAPON
/datum/table_recipe/lance
name = "explosive lance (grenade)"
name = "explosive lance"
result = /obj/item/weapon/twohanded/spear
reqs = list(/obj/item/weapon/twohanded/spear = 1,
/obj/item/weapon/grenade = 1)
@@ -39,15 +39,6 @@
time = 15
category = CAT_WEAPON
/datum/table_recipe/lance2
name = "explosive lance (C4)"
result = /obj/item/weapon/twohanded/spear
reqs = list(/obj/item/weapon/twohanded/spear = 1,
/obj/item/weapon/c4 = 1)
parts = list(/obj/item/weapon/c4 = 1)
time = 40
category = CAT_WEAPON
/datum/table_recipe/molotov
name = "Molotov"
@@ -321,11 +312,11 @@
category = CAT_MISC
/datum/table_recipe/chemical_payload
name = "chemical payload (C4)"
name = "Chemical Payload (C4)"
result = /obj/item/weapon/bombcore/chemical
reqs = list(
/obj/item/weapon/stock_parts/matter_bin/super = 1,
/obj/item/weapon/c4 = 1,
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/grenade/plastic/c4 = 1,
/obj/item/weapon/grenade/chem_grenade = 2
)
parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2)
@@ -333,7 +324,7 @@
category = CAT_WEAPON
/datum/table_recipe/chemical_payload2
name = "chemical payload (gibtonite)"
name = "Chemical Payload (gibtonite)"
result = /obj/item/weapon/bombcore/chemical
reqs = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
code/modules/flufftext/Hallucination.dm
+4 -4
View File
@@ -467,9 +467,9 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
/obj/item/weapon/cartridge/syndicate, /obj/item/clothing/under/chameleon,\
/obj/item/clothing/shoes/chameleon, /obj/item/weapon/card/id/syndicate,\
/obj/item/clothing/mask/chameleon, /obj/item/clothing/glasses/thermal,\
/obj/item/device/chameleon, /obj/item/weapon/card/emag,\
/obj/item/device/chameleon, /obj/item/weapon/card/emag, /obj/item/weapon/grenade/plastic/x4,\
/obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\
/obj/item/device/radio/headset/syndicate, /obj/item/weapon/c4,\
/obj/item/device/radio/headset/syndicate, /obj/item/weapon/grenade/plastic/c4,\
/obj/item/device/powersink, /obj/item/weapon/storage/box/syndie_kit,\
/obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/laser/captain,\
/obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\
@@ -642,7 +642,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
halitem.icon_state = "revolver"
halitem.name = "Revolver"
if(2) //c4
halitem.icon = 'icons/obj/assemblies.dmi'
halitem.icon = 'icons/obj/grenade.dmi'
halitem.icon_state = "plastic-explosive0"
halitem.name = "Mysterious Package"
if(prob(25))
@@ -685,7 +685,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER)
if(3)
//src << "C4"
halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
halimage = image('icons/obj/grenade.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
if(client) client.images += halimage
code/modules/mob/living/simple_animal/friendly/dog.dm
+2 -2
View File
@@ -164,7 +164,7 @@
usr << "<span class='warning'>\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!</span>"
return
if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
if(istype(item_to_add,/obj/item/weapon/grenade/plastic)) // last thing he ever wears, I guess
item_to_add.afterattack(src,usr,1)
return
@@ -200,7 +200,7 @@
/mob/living/simple_animal/pet/dog/corgi/proc/place_on_head(obj/item/item_to_add, mob/user)
if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
if(istype(item_to_add,/obj/item/weapon/grenade/plastic)) // last thing he ever wears, I guess
item_to_add.afterattack(src,user,1)
return
code/modules/ninja/ninja_event.dm
+1 -1
View File
@@ -206,7 +206,7 @@ Contents:
equip_to_slot_or_del(new /obj/item/clothing/glasses/night(src), slot_glasses)
equip_to_slot_or_del(EK, slot_belt)
equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_r_store)
equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_l_store)
equip_to_slot_or_del(new /obj/item/weapon/grenade/plastic/x4(src), slot_l_store)
equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen(src), slot_s_store)
equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back)
code/modules/uplink/uplink_item.dm
+10 -3
View File
@@ -844,10 +844,10 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
/datum/uplink_item/device_tools/c4
name = "Composition C-4"
desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls or connect \
a signaler to its wiring to make it remotely detonable. It has a modifiable timer with a \
desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, sabotage equipment, or connect \
an assembly to it in order to alter the way it detonates. It has a modifiable timer with a \
minimum setting of 10 seconds."
item = /obj/item/weapon/c4
item = /obj/item/weapon/grenade/plastic/c4
cost = 1
/datum/uplink_item/device_tools/c4bag
@@ -856,6 +856,13 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c4
cost = 9 //10% discount!
/datum/uplink_item/device_tools/x4bag
name = "Bag of X-4 explosives"
desc = "Contains 3 X-4 plastic explosives. Similar, but more powerful than C-4. X-4 can be placed on a solid surface, such as a wall or window, and it will \
blast through the wall, injuring anything on the opposite side, while being safer to the user. For when you want a wider, deeper, hole."
item = /obj/item/weapon/storage/backpack/dufflebag/syndie/x4
cost = 4 //
/datum/uplink_item/device_tools/powersink
name = "Power Sink"
desc = "When screwed to wiring attached to a power grid and activated, this large device places excessive \