forked from DarkPack13/SecondCity
-
Notifications
You must be signed in to change notification settings - Fork 17
Alt Title Loadouts & Outfits #29
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.
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
Draft
SixplyDev
wants to merge
15
commits into
Monkestation:master
Choose a base branch
from
SixplyDev:human-fuckery
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+65
−3
Draft
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ad96394
Testing alt job outfits
18b0c5e
Fixes
9ff0fb1
Fixing stuff again oops
f051cad
Dear shitcode please work
1fdb3c7
Trying something ill-advised
70a3b04
Shitcode unite
a4bd296
Shitcoding so much rn...
98c7328
Hoping my shitcode works
8118ef0
I cba to shitcode the rest
b7b69f0
original adjustments now outside the scope of this PR. Will make a se…
c44aecf
Update modular_darkpack/modules/jobs/code/anarchs/emissary.dm
SixplyDev d655089
Forgot to save and commit the tgstation.dme file oops
c0c7962
Merge branch 'human-fuckery' of https://github.com/SixplyDev/garou-su…
3bda3df
Chat I think we fixed it lowkey????
f1bad6f
Merge branch 'Monkestation:master' into human-fuckery
SixplyDev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| // TOWER ROLES BEGIN HERE | ||
|
|
||
| /datum/outfit/job/towerwork/towercleaner | ||
| name = "Tower Employee (Tower Cleaner)" | ||
| uniform = /obj/item/clothing/under/vampire/janitor | ||
| suit = null | ||
| shoes = /obj/item/clothing/shoes/vampire/jackboots/work | ||
| gloves = /obj/item/clothing/gloves/vampire/cleaning | ||
| r_pocket = /obj/item/vamp/keys/camarilla/ghoul | ||
| l_pocket = /obj/item/smartphone/tower_employee | ||
| backpack_contents = list(/obj/item/card/credit=1) | ||
|
|
||
| /datum/outfit/job/towerwork/towerassistant | ||
| name = "Tower Employee (Tower Assistant)" | ||
| uniform = /obj/item/clothing/under/vampire/office | ||
| gloves = null | ||
| suit = null | ||
| r_pocket = /obj/item/vamp/keys/camarilla/ghoul | ||
| l_pocket = /obj/item/smartphone/tower_employee | ||
| backpack_contents = list(/obj/item/passport=1, /obj/item/cockclock=1, /obj/item/flashlight=1, /obj/item/card/credit=1, /obj/item/clipboard=1, /obj/item/pen=1, /obj/item/folder/blue=1) | ||
|
|
||
| /datum/outfit/job/towerwork/towersecurityguard | ||
| name = "Tower Employee (Tower Security Guard)" | ||
| uniform = /obj/item/clothing/under/vampire/guard | ||
| shoes = /obj/item/clothing/shoes/vampire | ||
| gloves = null | ||
| suit = null | ||
| belt = /obj/item/gun/ballistic/automatic/vampire/m1911 | ||
| r_pocket = /obj/item/vamp/keys/camarilla/ghoul | ||
| l_pocket = /obj/item/smartphone/tower_employee | ||
| backpack_contents = list(/obj/item/flashlight=1, /obj/item/card/credit=1,/obj/item/food/vampire/donut=5, /obj/item/cockclock=1) | ||
|
|
||
| /datum/outfit/job/towerwork/towerpersonaldriver | ||
| name = "Tower Employee (Tower Personal Driver)" | ||
| uniform = /obj/item/clothing/under/vampire/suit | ||
| suit = null | ||
| head = /obj/item/clothing/head/vampire/chauffeur | ||
| gloves = /obj/item/clothing/gloves/vampire/white | ||
| r_pocket = /obj/item/vamp/keys/camarilla/ghoul | ||
| l_pocket = /obj/item/smartphone/tower_employee | ||
| backpack_contents = list(/obj/item/passport=1, /obj/item/cockclock=1, /obj/item/flashlight=1, /obj/item/card/credit=1, /obj/item/clipboard=1, /obj/item/pen=1, /obj/item/folder/red=1) | ||
|
|
||
| /datum/outfit/job/towerwork/towerpersonaldriver/pre_equip(mob/living/carbon/human/H) | ||
| ..() | ||
| if(H.gender == FEMALE) | ||
| uniform = /obj/item/clothing/under/vampire/suit/female | ||
|
|
||
| /datum/outfit/job/towerwork/towerpersonalattendant | ||
| name = "Tower Employee (Tower Personal Attendant)" | ||
| uniform = /obj/item/clothing/under/vampire/suit | ||
| r_pocket = /obj/item/vamp/keys/camarilla/ghoul | ||
| l_pocket = /obj/item/smartphone/tower_employee | ||
| backpack_contents = list(/obj/item/passport=1, /obj/item/cockclock=1, /obj/item/flashlight=1, /obj/item/card/credit=1, /obj/item/clipboard=1, /obj/item/pen=1, /obj/item/folder/red=1) | ||
|
|
||
| /datum/outfit/job/towerwork/towerpersonalattendant/pre_equip(mob/living/carbon/human/H) | ||
| ..() | ||
| if(H.gender == FEMALE) | ||
| uniform = /obj/item/clothing/under/vampire/suit/female | ||
| shoes = /obj/item/clothing/shoes/vampire/heels | ||
|
|
||
| // TOWER ROLES END HERE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the file isn't ticked
its not apart of tgstation.dme
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops, ticked. Let's see if it works.