cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8868 from VOREStation/upstream-merge-7571

Browse Source 
[MIRROR] Colony Director -> Site Manager
This commit is contained in:
Novacat
2020-08-28 13:17:58 -04:00
committed by GitHub
parent bac13fc41d 533cba89ec
commit 28c19ee066
61 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/dna_injector.dm
+2 -2
View File
@@ -67,7 +67,7 @@
if(istype(M,/mob/living))
var/mob/living/L = M
L.apply_effect(rand(5,20), IRRADIATE, check_protection = 0)
L.apply_damage(max(2,L.getCloneLoss()), CLONE)
L.apply_damage(max(2,L.getCloneLoss()), CLONE)
if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
if (buf.types & DNA2_BUF_UI)
@@ -158,7 +158,7 @@
/obj/item/weapon/dnainjector/xraymut
name = "\improper DNA injector (Xray)"
desc = "Finally you can see what the Colony Director does."
desc = "Finally you can see what the Site Manager does."
datatype = DNA2_BUF_SE
value = 0xFFF
//block = 8
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -1
View File
@@ -99,7 +99,7 @@
/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve
desc = "Use of this weapon may constiute a war crime in your area, consult your local Colony Director."
desc = "Use of this weapon may constiute a war crime in your area, consult your local Site Manager."
name = "clusterbang"
icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
code/game/objects/items/weapons/id cards/station_ids.dm
+4 -4
View File
@@ -138,13 +138,13 @@
preserve_item = 1
/obj/item/weapon/card/id/gold/captain
assignment = "Colony Director"
rank = "Colony Director"
assignment = "Site Manager"
rank = "Site Manager"
/obj/item/weapon/card/id/gold/captain/spare
name = "\improper Colony Director's spare ID"
name = "\improper Site Manager's spare ID"
desc = "The spare ID of the High Lord himself."
registered_name = "Colony Director"
registered_name = "Site Manager"
/obj/item/weapon/card/id/synthetic
name = "\improper Synthetic ID"
code/game/objects/items/weapons/manuals.dm
+1 -1
View File
@@ -1136,7 +1136,7 @@
Remember the order:<br>
<b>Disk, Code, Safety, Timer, Disk, RUN!</b><br><br>
Intelligence Analysts believe that normal corporate procedure is for the Colony Director to secure the nuclear authentication disk.<br><br>
Intelligence Analysts believe that normal corporate procedure is for the Site Manager to secure the nuclear authentication disk.<br><br>
Good luck!
</body>
code/game/objects/items/weapons/storage/backpack.dm
+3 -3
View File
@@ -93,7 +93,7 @@
icon_state = "securitypack"
/obj/item/weapon/storage/backpack/captain
name = "colony director's backpack"
name = "site manager's backpack"
desc = "It's a special backpack made exclusively for officers."
icon_state = "captainpack"
@@ -155,7 +155,7 @@
icon_state = "duffle_syndieammo"
/obj/item/weapon/storage/backpack/dufflebag/captain
name = "colony director's dufflebag"
name = "site manager's dufflebag"
desc = "A large dufflebag for holding extra captainly goods."
icon_state = "duffle_captain"
@@ -250,7 +250,7 @@
icon_state = "satchel_hyd"
/obj/item/weapon/storage/backpack/satchel/cap
name = "colony director's satchel"
name = "site manager's satchel"
desc = "An exclusive satchel for officers."
icon_state = "satchel-cap"
item_state_slots = list(slot_r_hand_str = "captainpack", slot_l_hand_str = "captainpack")