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

[TM-ONLY] Проверка кнопки Be Antagonist для Create Antagonist #2083

Closed
wants to merge 6 commits into from
Closed

[TM-ONLY] Проверка кнопки Be Antagonist для Create Antagonist #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a970540
Update oneclickantag.dm
Iajret Feb 21, 2024
c1fdd0a
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Mar 8, 2024
e74bd6f
spy added
Iajret Mar 8, 2024
b6cb843
spy role check
Iajret Mar 16, 2024
2efd876
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Apr 16, 2024
ee33cc3
Merge branch 'master' into createantagquickfix
Iajret Sep 14, 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
4 changes: 3 additions & 1 deletion code/modules/admin/topic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
to_chat(usr, "<span class='danger'>Not until the round starts!</span>", confidential = TRUE)
return

var/opt = null
var/opt = 1
switch(href_list["makeAntag"])
if(ROLE_BLOB)
opt = input("Set Blob Resource Gain Rate","Set Resource Rate",1) as num|null
Expand All @@ -78,6 +78,8 @@
opt = input("How Many", ROLE_OPERATIVE, 3) as num|null
if(ROLE_BROTHER)
opt = input("How Many", ROLE_BROTHER, 2) as num|null
if(ROLE_SPY)
opt = input("How Many", ROLE_SPY, 1) as num|null
if(ROLE_DRIFTING_CONTRACTOR)
opt = input("How Many", ROLE_DRIFTING_CONTRACTOR, 2) as num|null
if(src.make_antag(href_list["makeAntag"], opt))
Expand Down
7 changes: 7 additions & 0 deletions modular_nova/modules/oneclickantag/code/oneclickantag.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
switch(antagtype)
if(ROLE_TRAITOR)
src.add_antag_datum(/datum/antagonist/traitor)
if(ROLE_SPY)
src.add_antag_datum(/datum/antagonist/spy)
if(ROLE_CHANGELING)
src.add_antag_datum(/datum/antagonist/changeling)
if(ROLE_REV)
Expand Down Expand Up @@ -64,6 +66,8 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ
return FALSE
if(!(targetrole in applicant.client.prefs.be_special))
return FALSE
if(!applicant.client.prefs.read_preference(/datum/preference/toggle/be_antag))
return FALSE
if(onstation)
var/turf/T = get_turf(applicant)
if(!is_station_level(T.z))
Expand Down Expand Up @@ -96,6 +100,9 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ
if(ROLE_CHANGELING)
p_p += MAKEANTAG_PL_DEFAULT_SECURITY
p_p += MAKEANTAG_PL_DEFAULT_HEADS
if(ROLE_SPY)
p_p += MAKEANTAG_PL_DEFAULT_SECURITY
p_p += MAKEANTAG_PL_DEFAULT_HEADS
if(ROLE_CULTIST)
p_p += MAKEANTAG_PL_DEFAULT_SECURITY
p_p += MAKEANTAG_PL_DEFAULT_HEADS
Expand Down
Loading