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

Adds Mothan Pete Plushie #163

Closed
wants to merge 10 commits into from
Closed

Adds Mothan Pete Plushie #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
98984c4
trynaaddstuff
mothmapper Jul 11, 2024
71cf6ad
fixes
mothmapper Jul 11, 2024
c9e1de2
ye
mothmapper Jul 11, 2024
16b1b36
fixes
mothmapper Jul 11, 2024
7cf7cf7
testing
mothmapper Jul 11, 2024
4af9c7d
smthidk
mothmapper Jul 11, 2024
4e4db32
stuff
mothmapper Jul 11, 2024
ae72a3f
Merge branch 'donmotho' of https://github.com/mothmapper/grilledchees…
mothmapper Jul 11, 2024
f6b1b0d
fix
mothmapper Jul 11, 2024
d5c8356
fixes
mothmapper Jul 11, 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
2 changes: 1 addition & 1 deletion _maps/map_files/ProtoBoxStation/ProtoBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37360,7 +37360,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/table/wood,
/obj/effect/spawner/random/food_or_drink/snack,
/obj/item/toy/plush/explosive,
/turf/open/floor/iron/checker,
/area/station/science/breakroom)
"dQL" = (
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/effects/spawners/random/entertainment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@
/obj/item/toy/plush/beeplushie,
/obj/item/toy/plush/moth,
/obj/item/toy/plush/pkplush,
//MASSMETA ADDITION BEGIN
/obj/item/toy/plush/explosive
//MASSMETA ADDITION END
)

/obj/effect/spawner/random/entertainment/plushie_delux
Expand Down Expand Up @@ -279,6 +282,9 @@
/obj/item/toy/plush/bubbleplush = 2,
/obj/item/toy/plush/ratplush = 2,
/obj/item/toy/plush/narplush = 2,
//MASSMETA ADDITION BEGIN
/obj/item/toy/plush/explosive = 2,
//MASSMETA ADDITION END
)

/obj/effect/spawner/random/entertainment/colorful_grenades
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,4 +792,4 @@
icon_state = "blahaj"
inhand_icon_state = "blahaj"
attack_verb_continuous = list("gnaws", "gnashes", "chews")
attack_verb_simple = list("gnaw", "gnash", "chew")
attack_verb_simple = list("gnaw", "gnash", "chew")
Copy link

Choose a reason for hiding this comment

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

верни как было в коде офф ТГ

Binary file modified icons/obj/toys/plushes.dmi
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions massmeta/features/explushie/code/explushie.dm
View file
Open in desktop
mothmapper marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/obj/item/toy/plush/explosive
name = "an unusual moth plushie"
desc = "Chik-chiki boom, chik-chiki boom, chik-chiki boom..."
icon = 'massmeta/features/explushie/icons/plushes.dmi'
icon_state = "xestia"
attack_verb_continuous = list("booms", "explodes")
attack_verb_simple = list("boom", "explode")
squeak_override = list('sound/effects/explosion_distant.ogg' = 2)
Binary file added massmeta/features/explushie/icons/plushes.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions massmeta/features/explushie/includes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "code\explushie.dm"

3 changes: 2 additions & 1 deletion massmeta/modular_meta.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check failure on line 1 in massmeta/modular_meta.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Ticked File Enforcement 

Modular Ticked File Enforcement has failed!
* Это основной файл куда будут складываться все наши модульные добавления.
* Добавлять только:
* Модули (.dm файлами)
Expand All @@ -13,6 +13,7 @@

// BEGIN_INCLUDE
#include "features\additional_circuit\includes.dm"
#include "features\explushie\includes.dm"
#include "features\hardsuits\includes.dm"
#include "features\kvass\includes.dm"
#include "features\smites\includes.dm"
Expand Down Expand Up @@ -104,4 +105,4 @@

//Testicular_torsion wizard
#include "code\modules\spells\spell_types\touch\testicular_torsion.dm"
#include "code\modules\antags\wizard\equipment\spellbook_entries\offensive.dm"
#include "code\modules\antags\wizard\equipment\spellbook_entries\offensive.dm"
Loading