Skip to content

Commit f5c84c3

Browse files
committed
upd
1 parent f7b7fc1 commit f5c84c3

2 files changed

Lines changed: 40 additions & 19 deletions

File tree

modular_meta/features/pipivspiki/code/propaganda.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/obj/structure/sign/poster/propaganda
77
poster_item_name = "propagantistic poster"
8-
poster_item_desc = "An official elections 2026 is now. Vote today!"
8+
poster_item_desc = null
99
poster_item_icon_state = "rolled_legit"
1010
printable = TRUE
1111

modular_meta/features/pipivspiki/code/traits.dm

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,23 @@
7878

7979
var/vibori_stance = vibori[player_client.ckey]
8080
if((vibori_stance == RANDOM_PRO && prob(33)) || vibori_stance == PRO_PIPI)
81-
var/obj/item/storage/box/stickers/vibori/pro_pipi/boxie = new(spawned.loc)
81+
var/obj/item/storage/box/stickers/pro_pipi/boxie = new(spawned.loc)
8282
spawned.equip_to_storage(boxie, ITEM_SLOT_BACK, indirect_action = TRUE)
8383
if(ishuman(spawned))
8484
var/obj/item/clothing/suit/costume/wellworn_shirt/vibori/pipi/shirt = new(spawned.loc)
8585
if(!spawned.equip_to_slot_if_possible(shirt, ITEM_SLOT_OCLOTHING, indirect_action = TRUE))
8686
shirt.forceMove(boxie)
8787
return
8888
if((vibori_stance == RANDOM_PRO && prob(33)) || vibori_stance == PRO_PIKI)
89-
var/obj/item/storage/box/stickers/vibori/pro_piki/boxie = new(spawned.loc)
89+
var/obj/item/storage/box/stickers/pro_piki/boxie = new(spawned.loc)
9090
spawned.equip_to_storage(boxie, ITEM_SLOT_BACK, indirect_action = TRUE)
9191
if(!ishuman(spawned))
9292
var/obj/item/clothing/suit/costume/wellworn_shirt/vibori/piki/shirt = new(spawned.loc)
9393
if(!spawned.equip_to_slot_if_possible(shirt, ITEM_SLOT_OCLOTHING, indirect_action = TRUE))
9494
shirt.forceMove(boxie)
9595
return
9696
if((vibori_stance == RANDOM_PRO && prob(33)) || vibori_stance == PRO_MELOK)
97-
var/obj/item/storage/box/stickers/vibori/pro_mel/boxie = new(spawned.loc)
97+
var/obj/item/storage/box/stickers/pro_mel/boxie = new(spawned.loc)
9898
spawned.equip_to_storage(boxie, ITEM_SLOT_BACK, indirect_action = TRUE)
9999
if(!ishuman(spawned))
100100
var/obj/item/clothing/suit/costume/wellworn_shirt/vibori/melok/shirt = new(spawned.loc)
@@ -158,35 +158,56 @@
158158
greyscale_colors = "#D05050"
159159
post_init_icon_state = "wellworn_shirt_pro_melok"
160160

161-
/obj/item/storage/box/stickers/vibori
162-
icon = 'modular_meta/features/pipivspiki/icons/stickers.dmi'
163-
164-
/obj/item/storage/box/stickers/vibori/pro_pipi
161+
/obj/item/storage/box/stickers/pro_pipi
165162
name = "Pipidaster approved sticker pack"
163+
icon = 'modular_meta/features/pipivspiki/icons/stickers.dmi'
166164
desc = "2 YEARS ON STATION MADE YOU A FUCKING ADMIN!"
167165
illustration = "label_pipi"
166+
storage_type = /datum/storage/box/vibori/pro_pipi
168167

169168
/obj/item/storage/box/stickers/pro_pipi/PopulateContents()
170-
new /obj/item/sticker/vibori/pipi(src)
171-
new /obj/item/sticker/vibori/pipi(src)
172-
new /obj/item/sticker/vibori/pipi(src)
169+
for(var/i in 1 to 4)
170+
new /obj/item/sticker/vibori/pipi(src)
173171

174-
/obj/item/storage/box/stickers/vibori/pro_piki
172+
/obj/item/storage/box/stickers/pro_piki
175173
name = "Pikita approved sticker pack"
174+
icon = 'modular_meta/features/pipivspiki/icons/stickers.dmi'
176175
desc = "За силиконов и текущую власть!"
177176
illustration = "label_piki"
177+
storage_type = /datum/storage/box/vibori/pro_piki
178178

179179
/obj/item/storage/box/stickers/pro_piki/PopulateContents()
180-
new /obj/item/sticker/vibori/piki(src)
181-
new /obj/item/sticker/vibori/piki(src)
182-
new /obj/item/sticker/vibori/piki(src)
180+
for(var/i in 1 to 4)
181+
new /obj/item/sticker/vibori/piki(src)
183182

184-
/obj/item/storage/box/stickers/vibori/pro_mel
183+
/obj/item/storage/box/stickers/pro_mel
185184
name = "Melok approved sticker pack"
185+
icon = 'modular_meta/features/pipivspiki/icons/stickers.dmi'
186186
desc = "За новую власть и так далее!"
187187
illustration = "label_mel"
188+
storage_type = /datum/storage/box/vibori/pro_melok
188189

189190
/obj/item/storage/box/stickers/pro_mel/PopulateContents()
190-
new /obj/item/sticker/vibori/mel(src)
191-
new /obj/item/sticker/vibori/mel(src)
192-
new /obj/item/sticker/vibori/mel(src)
191+
for(var/i in 1 to 4)
192+
new /obj/item/sticker/vibori/mel(src)
193+
194+
/datum/storage/box/vibori/pro_pipi/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
195+
. = ..()
196+
set_holdable(exception_hold_list = list(
197+
/obj/item/sticker/vibori/pipi,
198+
/obj/item/clothing/suit/costume/wellworn_shirt/vibori/pipi,
199+
))
200+
201+
/datum/storage/box/vibori/pro_piki/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
202+
. = ..()
203+
set_holdable(exception_hold_list = list(
204+
/obj/item/sticker/vibori/piki,
205+
/obj/item/clothing/suit/costume/wellworn_shirt/vibori/piki,
206+
))
207+
208+
/datum/storage/box/vibori/pro_melok/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
209+
. = ..()
210+
set_holdable(exception_hold_list = list(
211+
/obj/item/sticker/vibori/mel,
212+
/obj/item/clothing/suit/costume/wellworn_shirt/vibori/melok,
213+
))

0 commit comments

Comments
 (0)