Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2768,7 +2768,8 @@ var/global/num_vending_terminals = 1
/obj/item/clothing/mask/gas/oni = 3,
/obj/item/clothing/head/helmet/samurai = 3,
/obj/item/clothing/suit/armor/samurai = 3,
/obj/item/toy/syndicateballoon/green = 1,
/obj/item/clothing/gloves/fyellow/insulted = 3,
/obj/item/toy/syndicateballoon/green = 1
)

pack = /obj/structure/vendomatpack/autodrobe
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/gloves/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@
. = ..()
siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)

if(Holiday == APRIL_FOOLS_DAY && siemens_coefficient != 0)
name = "insulted gloves"
desc = "These gloves will mock the wearer when shocked."

/obj/item/clothing/gloves/fyellow/insulted
name = "insulted gloves"
desc = "These gloves will mock the wearer when shocked."

/obj/item/clothing/gloves/black
desc = "These gloves are quite comfortable, and will keep you warm!"
name = "black gloves"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/power/powernet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,9 @@ var/global/powernets_broke = 0
if(H.gloves)
var/obj/item/clothing/gloves/G = H.gloves

if(G.name == "insulted gloves")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type check here would be better, even with the == since its less intensive but up to you to use that instead of istype()

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This type of check isn't too bad because strings are all stored as references on the string table... That said, this prevents renaming gloves for meme purposes. And hand labelers will silence the gloves for good.

This whole setup could be added as a general variable, such as var/insults_on_shock, to obj/item/clothing/gloves for adminbus purposes. Then you can simply check the variable here. Benefits? Admins get a new button to mess with players. Drawbacks? New meme variable on all gloves.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

speaking of meme variables, why does every fucking atom have a list of armor and a bunch of other stuff they never use?
if i recall right lummox said something about how retarded that is once

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My brother in christ, please just do a typecheck here instead of checking for the gloves' name.

Copy link
Collaborator Author

@Eneocho Eneocho Sep 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i do a name check cause otherwise the budget insulos turned insulted (april fools) don't insult you

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case, just transform the budget insuls into insulted gloves when equipped during April Fools.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wanted them to spawn transformed into the insulted ones instead (and I don't feel like remapping), that was the simplest option

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case just add an April fools check in the budget gloves New() proc which spawns insulted gloves and qdels the budget gloves

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

guess that works, lemme see what I can do

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did the thing

G.say(pick("Hah, dumbass", "Get fucked idiot", "You moron, what did you expect?", "Next time try the other yellow gloves, numbskull."))

if(G.siemens_coefficient == 0) // to avoid spamming with insulated glvoes on
return 0

Expand Down
Loading