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

pizza op #104

Closed
wants to merge 2 commits into from
Closed

pizza op #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d0bed0
pizza op
chaos-creations Nov 9, 2024
d9ac68a
блять.дм
chaos-creations Nov 9, 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
3 changes: 3 additions & 0 deletions code/__DEFINES/job_ru.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
#define JOB_SYNTH_SURVIVOR "Synth Survivor"
#define JOB_CO_SURVIVOR "CO Survivor"

#define JOB_DELIVERY "Delivery Boy"
#define JOB_DELIVERY_CORPSMAN "Delivery Corpsman"
#define JOB_DELIVERY_SOUTO "Delivery Souto"
#define JOB_RESERVE "Reserve Unit"

#define ANY_SURVIVOR "Any Survivor"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/mode_ru.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ GLOBAL_LIST_INIT(ROLES_FACTION_CLASH, ROLES_USCM + JOB_PREDATOR)


GLOBAL_LIST_INIT(ROLES_UNASSIGNED, list(JOB_SQUAD_MARINE))
GLOBAL_LIST_INIT(ROLES_AI, list(JOB_SO, JOB_PILOT, JOB_RESERVE, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE))
GLOBAL_LIST_INIT(ROLES_AI, list(JOB_SO, JOB_PILOT, JOB_RESERVE, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE, JOB_DELIVERY, JOB_DELIVERY_CORPSMAN, JOB_DELIVERY_SOUTO))
GLOBAL_LIST_INIT(ROLES_AI_UPP, list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_RESERVE, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP))
GLOBAL_LIST_INIT(ROLES_AI_FORECON, list(JOB_SQUAD_LEADER_FORECON, JOB_RESERVE, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO))
GLOBAL_LIST_INIT(ROLES_AI_FREELANCER, list(JOB_RTO_FL, JOB_SQUAD_LEADER_FL, JOB_SQUAD_TEAM_LEADER_FL, JOB_SQUAD_MEDIC_FL, JOB_SQUAD_SMARTGUN_FL, JOB_SQUAD_RIFLEMAN_FL))
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/effects/decals/posters/poster_list.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ Template
name = "YOU ALWAYS KNOW A WORKING JOE."
desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."

/datum/poster/poster_000
icon_state="poster000"
name = "EOJ GNIKROW A WONK SYAWLA UOY."
desc = "EOJ GNIKROW A WONK SYAWLA UOY. EOJ GNIKROW A WONK SYAWLA UOY. EOJ GNIKROW A WONK SYAWLA UOY. EOJ GNIKROW A WONK SYAWLA UOY. EOJ GNIKROW A WONK SYAWLA UOY."

/datum/poster/poster_12
icon_state="poster12"
name = "'Miss January' pinup"
Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2560,6 +2560,7 @@
#include "void-marines\code\special_roles.dm"
#include "void-marines\code\tin_can.dm"
#include "void-marines\code\vendors.dm"
#include "void-marines\code\loadout_presets\pizza.dm"
#include "void-marines\code\loadout_presets\rednecks.dm"
#include "void-marines\code\modules\mob\living\carbon\human\emote.dm"
#include "void-marines\code\playable_factions\alt_roles.dm"
Expand Down
Binary file modified icons/obj/structures/props/posters.dmi
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions map_config/maps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,6 @@ endmap

map whiskey_outpost_ru
endmap

map pizza
endmap
3 changes: 3 additions & 0 deletions map_config/shipmaps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ endmap

map golden_arrow_forecon
endmap

map pizza_station
endmap
Loading
Loading