cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 06:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8796 from Cerebulon/bloons

Browse Source 
Balloon Expansion (Inflation?)
This commit is contained in:
Atermonera
2022-10-28 14:48:56 -08:00
committed by GitHub
parent 1d09186a77 ed841af4cf
commit 51a70ffa95
19 changed files with 188 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preference_setup/loadout/gear_tweaks.dm
View File

@@ -551,4 +551,4 @@ var/global/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
/datum/gear_tweak/implant_location/get_metadata(var/user, var/metadata)
return (input(user, "Select a bodypart for the implant to be implanted inside.", "Implant Location", metadata || "upper body") as null|anything in bodypart_names_to_tokens) || bodypart_tokens_to_names[BP_TORSO]
#undef LOADOUT_BAN_STRING
#undef LOADOUT_BAN_STRING

18
code/modules/clothing/gloves/miscellaneous.dm
View File

@@ -58,12 +58,18 @@
fingerprint_chance = 25
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
// var/balloonPath = /obj/item/latexballon
var/balloon = /obj/item/toy/balloon/latex
//TODO: Make inflating gloves a thing
/*/obj/item/clothing/gloves/sterile/proc/Inflate(/mob/living/carbon/human/user)
user.visible_message("<span class='notice'>\The [src] expands!</span>")
qdel(src)*/
/obj/item/clothing/gloves/sterile/attackby(var/obj/O, mob/user as mob)
if(istype(O, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = O
if(C.use(1))
var/obj/item/L = new src.balloon
user.drop_from_inventory(L,get_turf(src))
to_chat(user, "<span class='notice'>You make a balloon.</span>")
qdel(src)
else
to_chat(user, "<span class='warning'>You need one length of cable to finish the balloon!</span>")
/obj/item/clothing/gloves/sterile/latex
name = "latex gloves"
@@ -74,7 +80,7 @@
desc = "Sterile nitrile gloves"
icon_state = "nitrile"
item_state = "ngloves"
// balloonPath = /obj/item/nitrileballoon
balloon = /obj/item/toy/balloon/nitrile
/obj/item/clothing/gloves/botanic_leather
desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."

4
code/modules/mining/abandonedcrates.dm
View File

@@ -56,12 +56,12 @@
if(51 to 52) // Uncommon, 2% each
new/obj/item/melee/classic_baton(src)
if(53 to 54)
new/obj/item/latexballon(src)
new/obj/item/toy/balloon/random(src)
if(55 to 56)
var/newitem = pick(typesof(/obj/item/toy/mecha) - /obj/item/toy/mecha)
new newitem(src)
if(57 to 58)
new/obj/item/toy/syndicateballoon(src)
new/obj/item/toy/balloon/syndicate(src)
if(59 to 60)
new/obj/item/rig(src)
if(61 to 62)

10
code/modules/random_map/drop/drop_types.dm
View File

@@ -221,8 +221,8 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/random/action_figure,
/obj/random/action_figure,
/obj/random/action_figure,
/obj/item/toy/nanotrasenballoon,
/obj/item/toy/syndicateballoon,
/obj/random/balloon,
/obj/random/balloon,
/obj/item/toy/sword,
/obj/item/toy/sword,
/obj/item/toy/sword,
@@ -257,7 +257,9 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/clothing/accessory/scarf/christmas,
/obj/item/clothing/accessory/scarf/christmas,
/obj/item/clothing/accessory/scarf/christmas,
/obj/item/clothing/accessory/scarf/christmas
/obj/item/clothing/accessory/scarf/christmas,
/obj/structure/balloon/candycane,
/obj/structure/balloon/xmas
)
/datum/supply_drop_loot/materials
@@ -320,4 +322,4 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/storage/box/syringes,
/obj/item/storage/box/autoinjectors)
/obj/item/storage/box/autoinjectors)