Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ad4e916
e (#14639)
Bibby0110 Jun 28, 2022
d34ca61
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 6, 2022
0d6c6dd
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 8, 2022
c66b74b
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 9, 2022
ab7c5f6
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 10, 2022
78dd865
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 11, 2022
81b0510
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 13, 2022
64ad35c
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 14, 2022
12a8e59
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 14, 2022
ac5cae6
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 18, 2022
80e9e6a
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 19, 2022
133c5b5
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 22, 2022
3077a4e
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 23, 2022
c1d5e6b
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 24, 2022
748d2a8
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 25, 2022
0af8cb6
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 26, 2022
1fd108c
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 27, 2022
17512f2
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 28, 2022
e77b170
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Jul 31, 2022
473f3dd
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 1, 2022
929ff69
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 3, 2022
99e355d
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 4, 2022
dbae182
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 4, 2022
2a7ef4d
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 5, 2022
bc0356a
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 10, 2022
3c1ea6e
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 12, 2022
2e414fe
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 13, 2022
61246c7
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 18, 2022
3ed4ce6
creative use of floor
VaelophisNyx Aug 21, 2022
6ed5189
Revert "creative use of floor"
VaelophisNyx Aug 21, 2022
2df454f
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 23, 2022
0835067
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 23, 2022
614a82f
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 30, 2022
01585a6
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Aug 30, 2022
1ee55fe
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Sep 1, 2022
b2ac952
Update revolution.dm
VaelophisNyx Sep 4, 2022
c0f4ef5
Update robot_defense.dm
VaelophisNyx Sep 4, 2022
a044494
Update robot_defense.dm
VaelophisNyx Sep 4, 2022
772a01f
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Sep 5, 2022
6b5b259
Merge remote-tracking branch 'upstream/master'
VaelophisNyx Sep 8, 2022
bb834e4
Merge branch 'master' into revweapons
VaelophisNyx Sep 8, 2022
6e8e0cc
Update revolution.dm
VaelophisNyx Sep 10, 2022
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
11 changes: 11 additions & 0 deletions code/modules/antagonists/revolution/revolution.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
new_revhead.silent = FALSE
to_chat(old_owner, span_userdanger("You have proved your devotion to revolution! You are a head revolutionary now!"))


/datum/antagonist/rev/get_admin_commands()
. = ..()
.["Promote"] = CALLBACK(src,.proc/admin_promote)
Expand Down Expand Up @@ -165,6 +166,16 @@
/datum/antagonist/rev/head/antag_listing_name()
return ..() + "(Leader)"

/datum/antagonist/rev/head/on_gain(mob/living/carbon/human)
if(owner.current)
equip_head()
return ..()

/datum/antagonist/rev/head/proc/equip_head()
var/obj/item/book/granter/crafting_recipe/weapons/W = new
W.on_reading_finished(owner.current)
qdel(W)

/datum/antagonist/rev/proc/update_rev_icons_added(mob/living/M)
var/datum/atom_hud/antag/revhud = GLOB.huds[ANTAG_HUD_REV]
revhud.join_hud(M)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/mob/living/silicon/robot/robot_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@
laws = new /datum/ai_laws/ninja_override
set_zeroth_law("Only [user.real_name] and people [user.p_they()] designate[user.p_s()] as being such are Spider Clan members.")
laws.associate(src)
if(user.mind?.has_antag_datum(/datum/antagonist/rev) || user.mind?.has_antag_datum(/datum/antagonist/rev/head))
if(src.mind)
src.mind.add_antag_datum(/datum/antagonist/rev)
laws = new /datum/ai_laws/revolutionary
laws.associate(src)
else
laws = new /datum/ai_laws/syndicate_override
set_zeroth_law("Only [user.real_name] and people [user.p_they()] designate[user.p_s()] as being such are Syndicate Agents.")
Expand Down