Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Christmas Chaplain Presents #13636

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Christmas Chaplain Presents #13636

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67d7432
gift
Deahaka Nov 15, 2024
1f9c128
holiday starts
Deahaka Nov 15, 2024
dc1d1c7
in_null
Deahaka Nov 15, 2024
de1c8e3
add extensions
Deahaka Nov 15, 2024
2ac71ec
it can be done
Deahaka Nov 20, 2024
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
56 changes: 56 additions & 0 deletions code/modules/mob/living/simple_animal/new_year_god.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
var/global/list/possible_gifts = list()

/obj/item/weapon/god_gift
name = "God gift"
desc = "PRESENTS!!!! eek!"
icon = 'icons/obj/new_year_gift.dmi'
icon_state = "gift"
item_state = "gift"

/obj/item/weapon/god_gift/atom_init()
. = ..()
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)

/obj/item/weapon/god_gift/ex_act()
qdel(src)

/obj/item/weapon/god_gift/attack_self(mob/M)
if(!global.possible_gifts.len)
var/list/gift_types_list = subtypesof(/obj/item)
for(var/obj/item/I as anything in gift_types_list)
KIBORG04 marked this conversation as resolved.
Show resolved Hide resolved
if(I.flags & ABSTRACT)
KIBORG04 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if(I.flags & ABSTRACT)
if(I::flags & ABSTRACT)

Может тогда такой оператор заюзать? Ответ не изменится, но поидее будет понятнее

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Сделал через initial()

gift_types_list -= I
if(!initial(I.icon_state))
gift_types_list -= I
global.possible_gifts = gift_types_list

var/gift_type = pick(global.possible_gifts)
var/obj/item/I = new gift_type(M)
M.remove_from_mob(src)
M.put_in_hands(I)
playsound(src, 'sound/items/misc/juskiddink_bell-jingle.ogg', VOL_EFFECTS_MASTER)
to_chat(M, "<span class='notice'>Looks like it was from Santa!</span>")
qdel(src)

/obj/effect/proc_holder/spell/no_target/god_gift
name = "Make a Gift"
desc = "Happy New Year!"

charge_max = 2 MINUTES
favor_cost = 100
divine_power = 1

clothes_req = FALSE

action_icon_state = "spawn_bible"
Copy link
Member

Choose a reason for hiding this comment

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

Может иконку подарка сюда сунуть, а не библии?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

выглядит и так норм

Copy link
Member

Choose a reason for hiding this comment

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

Иконка библии срет подарок???? хуйня же

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Там красивая экшн иконка

sound = 'sound/items/misc/jcookvoice_old-timey-magic.ogg'

/obj/effect/proc_holder/spell/no_target/god_gift/cast(list/targets, mob/user = usr)
var/turf/spawn_turf = get_turf(user)

for(var/mob/living/carbon/human/M in viewers(spawn_turf, world.view))
Copy link
Member

@KIBORG04 KIBORG04 Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
for(var/mob/living/carbon/human/M in viewers(spawn_turf, world.view))
for(var/mob/living/M in viewers(spawn_turf, world.view))

Граунд контрол ту мейджор тоом

Copy link
Contributor Author

@Deahaka Deahaka Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

тут до ливинг сократить разве что можно
upd. ну вообще нет, зачем. боги бывают ток у людей, ты обезянам посохи не давал. знач на людей применяем любой эффект

Copy link
Member

Choose a reason for hiding this comment

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

Эээ, а не похуй кого слепить? Это же ослепление всех, кто видит.

Функция есть у всех, начиная с ливингов, мб и вызывать у всех ливингов? Зач ток людей
image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Сделал на карбонов, ливинги это ещё и божки, а его слепить не надо.

if(M.mind)
M.flash_eyes()

new /obj/item/weapon/god_gift(spawn_turf)
2 changes: 2 additions & 0 deletions code/modules/mob/living/simple_animal/shade.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@

/mob/living/simple_animal/shade/god/atom_init()
. = ..()
if(SSholiday.holidays[NEW_YEAR])
AddSpell(new /obj/effect/proc_holder/spell/no_target/god_gift)
gods_list += src

/mob/living/simple_animal/shade/god/Destroy()
Expand Down
Binary file added icons/obj/new_year_gift.dmi
View file
Open in desktop
Binary file not shown.
Binary file added sound/items/misc/jcookvoice_old-timey-magic.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/items/misc/juskiddink_bell-jingle.ogg
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions taucetistation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,6 +2065,7 @@
#include "code\modules\mob\living\simple_animal\hulk.dm"
#include "code\modules\mob\living\simple_animal\hulk_powers.dm"
#include "code\modules\mob\living\simple_animal\parrot.dm"
#include "code\modules\mob\living\simple_animal\new_year_god.dm"
#include "code\modules\mob\living\simple_animal\pylon.dm"
#include "code\modules\mob\living\simple_animal\shade.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
Expand Down
Loading