cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed every instance of "plastique" (c4 explosives) to "c4" (#25924)

Browse Source 
* Renamed every instance of "plastique" (c4 explosives) to "c4"

This is in the name of every admin out here and anybody doing testing. Fuck you old c*ders.

* fuck you plosky and old test map nobody uses

* PLOOOSKKYYYYY
This commit is contained in:
Irradiation
2020-02-29 00:36:43 -05:00
committed by GitHub
parent dedf8edced
commit 3ccceb090a
15 changed files with 338 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/gamemode/factions/syndicate/nukeops.dm
View File

@@ -164,7 +164,7 @@
affected.implants += E
E.part = affected
synd_mob.update_icons()
if(synd_mob.mind.GetRole(NUKE_OP_LEADER))
synd_mob.equip_to_slot_or_del(new /obj/item/device/modkit/syndi_commander(src), slot_in_backpack)
return 1
@@ -218,9 +218,9 @@
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/storage/belt/utility/complete(synd_mob), slot_belt)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/lethalshells(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/melee/energy/sword(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/plastique(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/plastique(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/plastique(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/c4(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/c4(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/weapon/c4(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_drop(new /obj/item/clothing/glasses/welding/superior(synd_mob), slot_l_store)
synd_mob.put_in_hand(GRASP_RIGHT_HAND, new /obj/item/clothing/shoes/magboots/syndie/elite(synd_mob))
if("Stealth") //WE STELT. Has an energy crossbow primary and a silenced pistol with magazines, along with a basic kit of infiltration items you could need to not nuke the Ops' credits

2
code/datums/uplink_item.dm
View File

@@ -477,7 +477,7 @@ var/list/uplink_items = list()
/datum/uplink_item/sabotage_tools/plastic_explosives
name = "Composition C-4"
desc = "C-4 is plastic explosive of the common variety Composition C. Can be attached to any item or organic to reliably destroy it. Connect a signaler to its wiring to make it remotely detonable even when unplanted. Timer starts at 10 seconds but can be set to any length. Takes a few seconds to apply."
item = /obj/item/weapon/plastique
item = /obj/item/weapon/c4
cost = 4
/datum/uplink_item/sabotage_tools/megaphone

6
code/datums/wires/explosive.dm
View File

@@ -18,16 +18,16 @@ var/const/WIRE_EXPLODE = 1
explode()
/datum/wires/explosive/plastic
holder_type = /obj/item/weapon/plastique
holder_type = /obj/item/weapon/c4
/datum/wires/explosive/plastic/CanUse(var/mob/living/L)
if(!..())
return 0
var/obj/item/weapon/plastique/P = holder
var/obj/item/weapon/c4/P = holder
if(P.open_panel)
return 1
return 0
/datum/wires/explosive/plastic/explode()
var/obj/item/weapon/plastique/P = holder
var/obj/item/weapon/c4/P = holder
P.explode(get_turf(P))

18
code/game/objects/items/weapons/explosives.dm
View File

@@ -1,6 +1,6 @@
/obj/item/weapon/plastique
/obj/item/weapon/c4
name = "plastic explosives"
desc = "Used to put holes in specific areas without too much extra hole."
gender = PLURAL
@@ -15,18 +15,18 @@
var/atom/target = null
var/open_panel = 0
/obj/item/weapon/plastique/New()
/obj/item/weapon/c4/New()
. = ..()
wires = new(src)
/obj/item/weapon/plastique/Destroy()
/obj/item/weapon/c4/Destroy()
if(wires)
qdel(wires)
wires = null
..()
/obj/item/weapon/plastique/suicide_act(var/mob/user)
/obj/item/weapon/c4/suicide_act(var/mob/user)
. = (SUICIDE_ACT_BRUTELOSS)
to_chat(viewers(user), "<span class='danger'>[user] activates the C4 and holds it above \his head! It looks like \he's going out with a bang!</span>")
var/message_say = "FOR NO RAISIN!"
@@ -43,7 +43,7 @@
explode(get_turf(user))
return .
/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user)
/obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user)
if(I.is_screwdriver(user))
open_panel = !open_panel
to_chat(user, "<span class='notice'>You [open_panel ? "open" : "close"] the wire panel.</span>")
@@ -52,14 +52,14 @@
else
..()
/obj/item/weapon/plastique/attack_self(mob/user as mob)
/obj/item/weapon/c4/attack_self(mob/user as mob)
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
if(newtime > 60000)
newtime = 60000
timer = newtime
to_chat(user, "Timer set for [timer] seconds.")
/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag)
/obj/item/weapon/c4/afterattack(atom/target as obj|turf, mob/user as mob, flag)
if (!flag)
return
if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/))
@@ -107,7 +107,7 @@
spawn(timer*10)
explode(get_turf(target))
/obj/item/weapon/plastique/proc/explode(var/location)
/obj/item/weapon/c4/proc/explode(var/location)
if(!target)
@@ -129,5 +129,5 @@
// target = null
qdel(src)
/obj/item/weapon/plastique/attack(mob/M as mob, mob/user as mob, def_zone)
/obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone)
return

2
code/game/objects/items/weapons/storage/secure.dm
View File

@@ -237,7 +237,7 @@
new /obj/item/weapon/gun/energy/crossbow(src)
new /obj/item/weapon/gun/projectile/mateba(src)
new /obj/item/ammo_storage/box/a357(src)
new /obj/item/weapon/plastique(src)
new /obj/item/weapon/c4(src)
// -----------------------------
// Secure Safe

6
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -29,7 +29,7 @@
new /obj/item/weapon/gun/projectile(src)
new /obj/item/ammo_storage/box/a357(src)
new /obj/item/weapon/card/emag(src)
new /obj/item/weapon/plastique(src)
new /obj/item/weapon/c4(src)
if("murder")//8+6+6+2+4=26
new /obj/item/weapon/melee/energy/sword(src)
@@ -72,7 +72,7 @@
new /obj/item/weapon/soap/syndie(src)
new /obj/item/device/chameleon(src)
new /obj/item/device/encryptionkey/syndicate/hacked(src)
new /obj/item/weapon/plastique(src)
new /obj/item/weapon/c4(src)
if("psycho")//1+1+5+2+6+(fireaxe, 6?)+2=23
new /obj/item/clothing/suit/raincoat(src)
@@ -273,7 +273,7 @@ obj/item/weapon/storage/box/syndie_kit/cheaptide
..()
new /obj/item/weapon/implanter/traitor(src)
new /obj/item/clothing/glasses/sunglasses/sechud/syndishades(src)
/obj/item/weapon/storage/box/syndie_kit/flaregun
name = "box (modified flare gun)"

6
code/game/objects/loadouts.dm
View File

@@ -262,7 +262,7 @@
/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/pinpointer,
/obj/item/weapon/shield/energy,
/obj/item/weapon/plastique,
/obj/item/weapon/c4,
/obj/item/weapon/gun/energy/pulse_rifle,
/obj/item/weapon/card/id/death_commando)
@@ -298,9 +298,9 @@
/obj/item/weapon/storage/box,
/obj/item/ammo_storage/box/c45,
/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/plastique,
/obj/item/weapon/c4,
/obj/item/osipr_core,
/obj/item/weapon/plastique,
/obj/item/weapon/c4,
/obj/item/energy_magazine/osipr,
/obj/item/weapon/gun/osipr,
/obj/item/weapon/card/id/syndicate/commando)

2
code/game/striketeams/nanotrasen_deathsquad.dm
View File

@@ -100,7 +100,7 @@
if (leader)
equip_to_slot_or_del(new /obj/item/weapon/disk/nuclear(src), slot_in_backpack)
else
equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack)
//Other equipment and accessories
equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_belt)

4
code/game/striketeams/syndicate_elite_squad.dm
View File

@@ -85,14 +85,14 @@
equip_to_slot_or_del(new /obj/item/weapon/storage/box(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/ammo_storage/box/c45(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/osipr_core(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/gun/osipr(src), slot_in_backpack)
if (leader)
equip_to_slot_or_del(new /obj/item/weapon/pinpointer(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/disk/nuclear(src), slot_in_backpack)
else
equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/energy_magazine/osipr(src), slot_in_backpack)
var/obj/item/weapon/card/id/syndicate/W = new(src) //Untrackable by AI

2
code/modules/clothing/spacesuits/rig.dm
View File

@@ -575,7 +575,7 @@
desc = "A heavily armored suit that protects against a lot of things. Used in special operations."
icon_state = "rig-deathsquad"
item_state = "rig-deathsquad"
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_storage,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/weapon/plastique,/obj/item/weapon/disk/nuclear)
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_storage,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/weapon/c4,/obj/item/weapon/disk/nuclear)
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.5

2
code/modules/flufftext/Hallucination.dm
View File

@@ -526,7 +526,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
/obj/item/clothing/mask/gas/voice, /obj/item/clothing/glasses/thermal,\
/obj/item/device/chameleon, /obj/item/weapon/card/emag,\
/obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\
/obj/item/device/radio/headset/syndicate, /obj/item/weapon/plastique,\
/obj/item/device/radio/headset/syndicate, /obj/item/weapon/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/device/rcd, /obj/item/weapon/tank/jetpack,\

10
code/modules/mob/living/simple_animal/friendly/corgi.dm
View File

@@ -241,7 +241,7 @@
if(!item_to_add)
usr.visible_message("<span class='notice'>[usr] pets [src]</span>","<span class='notice'>You rest your hand on [src]'s back for a moment.</span>")
return
if(istype(item_to_add,/obj/item/weapon/plastique)) // last thing he ever wears, I guess
if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,usr,1)
return
@@ -284,7 +284,7 @@
/mob/living/simple_animal/corgi/proc/place_on_head(obj/item/item_to_add)
if(istype(item_to_add,/obj/item/weapon/plastique)) // last thing he ever wears, I guess
if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,usr,1)
return
@@ -568,7 +568,7 @@
spin_emotes = list("dances around.","chases his tail.")
is_pet = TRUE
var/creatine_had = 0
/mob/living/simple_animal/corgi/Ian/Life()
..()
var/creatine = reagents.has_reagent(CREATINE)
@@ -581,7 +581,7 @@
else if(!creatine && creatine_had)
visible_message("<span class='danger'>[src]'s muscles tear themselves apart!</span>")
gib()
if(creatine && hyperzine)
treadmill_speed = 30
time_between_directed_steps = 1
@@ -591,7 +591,7 @@
else if(hyperzine)
treadmill_speed = 3
src.Jitter(2 SECONDS)
time_between_directed_steps = 3
time_between_directed_steps = 3
else
treadmill_speed = 0.5
time_between_directed_steps = initial(time_between_directed_steps)

18
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -4571,7 +4571,7 @@
LEXORIN=5, GRAVY=5, DETCOFFEE=5, AMUTATIONTOXIN=5, GYRO=5, SILENCER= 5, URANIUM=5)
var/reagent=pick(possible_reagents)
reagents.add_reagent(reagent, possible_reagents[reagent])
/obj/item/weapon/reagent_containers/food/snacks/lollipop
name = "lollipop"
desc = "Suck on this!"
@@ -4590,7 +4590,7 @@
volume = 15 //not a lotta room for poison
/obj/item/weapon/reagent_containers/food/snacks/lollipop/New()
..()
..()
eatverb = pick("bite","crunch","chomp")
reagents.add_reagent(NUTRIMENT, 2)
reagents.add_reagent(SUGAR, 8)
@@ -4599,16 +4599,16 @@
colorpop.color = pick(random_color_list)
src.overlays += colorpop
filling_color = colorpop.color
/obj/item/weapon/reagent_containers/food/snacks/lollipop/consume()
..()
candyness -= bitesize*10 //taking a bite out reduces how long it'll last
/obj/item/weapon/reagent_containers/food/snacks/lollipop/proc/updateconsuming(var/consuming)
if(consuming)
processing_objects.Add(src)
else
processing_objects.Remove(src)
processing_objects.Remove(src)
/obj/item/weapon/reagent_containers/food/snacks/lollipop/process()
var/mob/living/carbon/human/H = get_holder_of_type(src,/mob/living/carbon/human)
@@ -4616,7 +4616,7 @@
updateconsuming(FALSE)
return
if(H.isDead()) //human isn't really consuming it
return
return
if(H.is_wearing_item(src,slot_wear_mask))
candyness--
if(candyness <= 0)
@@ -4630,11 +4630,11 @@
reagents.trans_to(H, 1, log_transfer = FALSE, whodunnit = null)
if(candyness%50 == 0) //every 50 ticks, so ~3 times
bitecount++ //we're arguably eating it
/obj/item/weapon/reagent_containers/food/snacks/lollipop/equipped(mob/living/carbon/human/H, equipped_slot)
if(!H.isDead())
updateconsuming(equipped_slot == slot_wear_mask)
/obj/item/trash/lollipopstick
name = "lollipop stick"
desc = "A small plastic stick."
@@ -5446,7 +5446,7 @@
reagents.add_reagent(NUTRIMENT, 8)
reagents.add_reagent(TOMATOJUICE, 15)
var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/item/toy/bomb, /obj/item/weapon/plastique, /obj/item/device/fuse_bomb, /obj/item/weapon/grenade, /obj/item/device/onetankbomb)
var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/item/toy/bomb, /obj/item/weapon/c4, /obj/item/device/fuse_bomb, /obj/item/weapon/grenade, /obj/item/device/onetankbomb)
/obj/item/weapon/reagent_containers/food/snacks/lasagna/can_hold(obj/item/weapon/W) //GREAT SCOTT!
if(is_type_in_list(W, bomb_like_items))

638
maps/NRVHorizon.dmm
View File

File diff suppressed because it is too large Load Diff

2
maps/test_box.dmm
View File

@@ -8013,7 +8013,7 @@
"cYe" = (/obj/machinery/door/poddoor{id_tag = "QMLoaddoor2"; name = "Supply Shuttle Loading Door"},/obj/machinery/conveyor{dir = 4; id_tag = "QMLoad2"},/turf/simulated/shuttle/plating,/area/shuttle/supply)
"cYf" = (/obj/machinery/conveyor{dir = 4; id_tag = "anosample"},/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy)
"cYg" = (/obj/machinery/conveyor{dir = 4; id_tag = "anosample"},/obj/structure/plasticflaps/mining,/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy)
"cYh" = (/obj/structure/closet/bombcloset,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/effect/spawner/newbomb/timer,/obj/item/clothing/head/advancedeod_helmet,/obj/item/clothing/suit/advancedeod,/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
"cYh" = (/obj/structure/closet/bombcloset,/obj/effect/spawner/newbomb/timer,/obj/item/clothing/head/advancedeod_helmet,/obj/item/clothing/suit/advancedeod,/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
"cYi" = (/obj/effect/decal{alpha = 150; icon = 'icons/logos.dmi'; icon_state = "nano-logo"; pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/evac)
"cYj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/escape/centcom)
"cYk" = (/obj/structure/grille,/obj/structure/shuttle/window{icon_state = "8"},/turf/simulated/shuttle/floor,/area/shuttle/supply)