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

[Add] QuadrupleSec #1327

Closed
wants to merge 4 commits into from
Closed

[Add] QuadrupleSec #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46d8d38
QuadrupleSec
HardexZ Jun 17, 2024
453d0bc
Nasral....
HardexZ Jun 17, 2024
2ec45e9
fix?
HardexZ Jun 17, 2024
f3a44d7
icon mc fix
HardexZ Jun 17, 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
9 changes: 9 additions & 0 deletions modular_ss220/food/_food.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@
#include "code/food/food.dm"
#include "code/food/nails.dm"
#include "code/food/ingredients.dm"
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
// END_FILE_DIR
// BEGIN_PREFERENCES
// END_PREFERENCES
// BEGIN_INCLUDE
// END_INCLUDE
Comment on lines +10 to +18
Copy link
Collaborator

Choose a reason for hiding this comment

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

насрано

21 changes: 21 additions & 0 deletions modular_ss220/food/code/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,3 +584,24 @@
required_reagents = list("trinary" = 1, "codelibre" = 1, "rewriter" = 1, "irishempbomb" = 1, "synthanol" = 1 )
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'


Comment on lines +587 to +588
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change

/datum/reagent/consumable/ethanol/quadruple_sec
name = "Quadruple Sec"
id = "quadruple_sec"
description = "Бьет по голове как плазмабатон."
color = "#cc0000"
alcohol_perc = 0.6
drink_icon = "quadruple_sec"
drinking_glass_icon = 'modular_ss220/food/icons/drinks.dmi'
drink_name = "Quadruple Sec"
drink_desc = "Бьет по голове как плазмабатон."
taste_description = "бодрящая горькая свежесть; ни один враг станции не останется непобежденным"

/datum/chemical_reaction/quadruple_sec
name = "Quadruple Sec"
id = "quadruple_sec"
result = "quadruple_sec"
required_reagents = list("bahama_mama" = 5, "triple_citrus" = 5, "grapejuice" = 5 )
result_amount = 15
mix_sound = 'sound/weapons/taser.ogg'
Binary file modified modular_ss220/food/icons/drinks.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions paradise.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#include "code\__DEFINES\_protection.dm"
#include "code\__DEFINES\_readme.dm"
#include "code\__DEFINES\_spacemandmm.dm"
// SS220 ADDITION START : MODPACK TOGGLING
#include "code\__DEFINES\_ss220.dm"
// SS220 ADDITION END
Comment on lines -27 to -29
Copy link
Collaborator

Choose a reason for hiding this comment

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

НАСРАНО

Copy link
Author

Choose a reason for hiding this comment

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

оно поэтому и в драфте >:(

#include "code\__DEFINES\_tgs_defines.dm"
#include "code\__DEFINES\_tick.dm"
#include "code\__DEFINES\_versions.dm"
Expand Down
Loading