Skip to content

Commit

Permalink
First pass
Browse files Browse the repository at this point in the history
  • Loading branch information
Crossedfall committed Aug 30, 2019
1 parent fcde7ea commit 6a99eb8
Show file tree
Hide file tree
Showing 292 changed files with 437 additions and 441 deletions.
4 changes: 0 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,6 @@ This is good:
````
This prevents nesting levels from getting deeper then they need to be.

### Project Naming

Public-facing references to the server should be `NSV13`, However, CODE references, such as inline downstream edits, MUST refer to the internal name `sephora`. This is to prevent undue work changing this name.

### Develop Secure Code

* Player input must always be escaped safely, we recommend you use stripped_input in all cases where you would use input. Essentially, just always treat input from players as inherently malicious and design with that use case in mind
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ matrix:
- tools/travis/install_build_tools.sh
- tools/travis/install_spaceman_dmm.sh dreamchecker
script:
- tools/travis/check_filedirs.sh sephora.dme
- tools/travis/check_filedirs.sh nsv13.dme
- tools/travis/check_changelogs.sh
- find . -name "*.php" -print0 | xargs -0 -n1 php -l
- find . -name "*.json" -not -path "./tgui/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
Expand All @@ -42,7 +42,7 @@ matrix:
before_script:
- tools/travis/template_dm_generator.py
script:
- tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS sephora.dme
- tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS nsv13.dme

- name: "Compile and Run Tests"
addons:
Expand Down Expand Up @@ -73,7 +73,7 @@ matrix:
- mysql -u root tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql
- tools/travis/build_bsql.sh
script:
- tools/travis/dm.sh -DTRAVISBUILDING sephora.dme || travis_terminate 1
- tools/travis/dm.sh -DTRAVISBUILDING nsv13.dme || travis_terminate 1
- tools/travis/run_server.sh

- name: "Generate Documentation"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## NVS 13 codebase

[![Build Status](https://api.travis-ci.org/DDMers/sephora.png)](https://travis-ci.org/DDMers/sephora) [![Krihelimeter](https://www.krihelinator.xyz/badge/DDMers/sephora)](https://www.krihelinator.xyz)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/DDMers/sephora.svg)](https://isitmaintained.com/project/DDMers/sephora "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/DDMers/sephora.svg)](https://isitmaintained.com/project/DDMers/sephora "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg)
[![Build Status](https://api.travis-ci.org/DDMers/nsv13.png)](https://travis-ci.org/DDMers/nsv13) [![Krihelimeter](https://www.krihelinator.xyz/badge/DDMers/nsv13)](https://www.krihelinator.xyz)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/DDMers/nsv13.svg)](https://isitmaintained.com/project/DDMers/nsv13 "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/DDMers/nsv13.svg)](https://isitmaintained.com/project/DDMers/nsv13 "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg)
[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)

### NSV Information
Expand Down
4 changes: 2 additions & 2 deletions _maps/templates/NSV13_Boarder.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@
"ob" = (
/obj/structure/bed/pod,
/obj/item/bedsheet/syndie,
/obj/effect/mob_spawn/human/sephora/syndicate_crew/pilot,
/obj/effect/mob_spawn/human/nsv13/syndicate_crew/pilot,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/nsv13/trooptransport)
"pv" = (
Expand Down Expand Up @@ -1839,7 +1839,7 @@
/turf/open/floor/plasteel/dark,
/area/space)
"YV" = (
/obj/effect/mob_spawn/human/sephora/syndicate_crew,
/obj/effect/mob_spawn/human/nsv13/syndicate_crew,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/nsv13/trooptransport)
"Zo" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/templates/NSV13_Yacht.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@
id = "Cell 2";
name = "Cell 2"
},
/obj/effect/mob_spawn/human/sephora/nt_prisoner,
/obj/effect/mob_spawn/human/nsv13/nt_prisoner,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/nsv13/yacht)
"nq" = (
Expand Down Expand Up @@ -2143,7 +2143,7 @@
id = "Cell 1";
name = "Cell 1"
},
/obj/effect/mob_spawn/human/sephora/nt_prisoner,
/obj/effect/mob_spawn/human/nsv13/nt_prisoner,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/nsv13/yacht)
"Lu" = (
Expand Down Expand Up @@ -2421,7 +2421,7 @@
id = "Cell 3";
name = "Cell 3"
},
/obj/effect/mob_spawn/human/sephora/nt_prisoner,
/obj/effect/mob_spawn/human/nsv13/nt_prisoner,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/nsv13/yacht)
"Wr" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/templates/NSV13_prison_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@
/obj/machinery/shower{
dir = 4
},
/obj/effect/mob_spawn/human/sephora/nt_prisoner,
/obj/effect/mob_spawn/human/nsv13/nt_prisoner,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/nsv13/prisonship)
"kb" = (
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define DEADMIN_POSITION_HEAD (1<<17)
#define DEADMIN_POSITION_SECURITY (1<<18)
#define DEADMIN_POSITION_SILICON (1<<19)
#define WIDESCREEN_TOGGLE_PREF (1<<20) //Sephora - Widescreen preference
#define WIDESCREEN_TOGGLE_PREF (1<<20) //nsv13 - Widescreen preference

#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)

Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#define CHANNEL_AMBIENCE 1018
#define CHANNEL_BUZZ 1017
#define CHANNEL_BICYCLE 1016
#define CHANNEL_SHIP_ALERT 1015 //Sephora - sound channel for looping ship alerts, EG general quarters
#define CHANNEL_REACTOR_ALERT 1014 //Sephora - sound channel for the nuclear storm drive meltdown sfx.
#define CHANNEL_SHIP_ALERT 1015 //nsv13 - sound channel for looping ship alerts, EG general quarters
#define CHANNEL_REACTOR_ALERT 1014 //nsv13 - sound channel for the nuclear storm drive meltdown sfx.

//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
Expand Down
4 changes: 2 additions & 2 deletions code/__HELPERS/icon_smoothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#define DEFAULT_UNDERLAY_ICON_STATE "plating"

/atom/var/smooth = SMOOTH_FALSE
/atom/var/legacy_smooth = FALSE //Sephora - Goon walls
/atom/var/legacy_smooth = FALSE //nsv13 - Goon walls
/atom/var/top_left_corner
/atom/var/top_right_corner
/atom/var/bottom_left_corner
Expand Down Expand Up @@ -119,7 +119,7 @@
if(QDELETED(A))
return
if(A.smooth & (SMOOTH_TRUE | SMOOTH_MORE))
if(A.legacy_smooth) //Sephora - Adds support for goon style walls
if(A.legacy_smooth) //nsv13 - Adds support for goon style walls
A.legacy_smooth()
return
var/adjacencies = calculate_adjacencies(A)
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/drag_drop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
/obj/item/gun/CanItemAutoclick(object, location, params)
. = automatic

//Sephora start - Overmap stuff
//nsv13 start - Overmap stuff
/client/MouseMove(object,location,control,params)
mouseParams = params
mouseLocation = location
Expand All @@ -107,7 +107,7 @@
/datum/proc/onMouseMove(object, location, control, params)
return

//Sephora end
//nsv13 end

/atom/proc/IsAutoclickable()
. = 1
Expand Down
4 changes: 2 additions & 2 deletions code/game/atoms_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
if(!direct)
direct = get_dir(src, newloc)
setDir(direct)
//Sephora start - multi tile object handling
//nsv13 start - multi tile object handling
if(bound_width != world.icon_size || bound_height != world.icon_size)
var/list/newlocs = isturf(newloc) ? block(locate(newloc.x+(-bound_x)/world.icon_size,newloc.y+(-bound_y)/world.icon_size,newloc.z),locate(newloc.x+(-bound_x+bound_width)/world.icon_size-1,newloc.y+(-bound_y+bound_height)/world.icon_size-1,newloc.z)) : list(newloc)
if(!newlocs)
Expand All @@ -238,7 +238,7 @@

if(!newloc.Enter(src, src.loc))
return
//Sephora end
//nsv13 end
if(!loc.Exit(src, newloc))
return

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1258,8 +1258,8 @@
icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_extmai
if("Ship") //Sephora Ship Stuff
icon = 'sephora/icons/obj/machinery/doors/standard.dmi'
if("Ship") //nsv13 Ship Stuff
icon = 'nsv13/icons/obj/machinery/doors/standard.dmi'
overlays_file = null
assemblytype = /obj/machinery/door/airlock/ship
update_icon()
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/radio/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
var/syndie = FALSE // If true, hears all well-known channels automatically, and can say/hear on the Syndicate channel.
var/list/channels = list() // Map from name (see communications.dm) to on/off. First entry is current department (:h).
var/list/secure_radio_connections
var/list/radio_sounds = list('sephora/sound/effects/radio1.ogg','sephora/sound/effects/radio2.ogg') //Sephora - Radios make small static noises now
var/list/radio_sounds = list('nsv13/sound/effects/radio1.ogg','nsv13/sound/effects/radio2.ogg') //nsv13 - Radios make small static noises now

var/const/FREQ_LISTENING = 1
//FREQ_BROADCASTING = 2
Expand Down Expand Up @@ -205,7 +205,7 @@
return
if(!M.IsVocal())
return
if(radio_sounds.len) //Sephora - Radios make small static sounds now.
if(radio_sounds.len) //nsv13 - Radios make small static sounds now.
var/sound/radio_sound = pick(radio_sounds)
playsound(M.loc, radio_sound, 50, 1)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/*
* Metal
*/
//Sephora - Torpedo Casing added to the end of this list
//nsv13 - Torpedo Casing added to the end of this list
GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
var/perunit = MINERAL_MATERIAL_AMOUNT
var/sheettype = null //this is used for girders in the creation of walls/false walls
var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity.
var/turf_type = null //Sephora - Wall stuff
var/turf_type = null //nsv13 - Wall stuff
2 changes: 1 addition & 1 deletion code/game/turfs/openspace/openspace.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
if(!T)
vis_contents.len = 0
if(prune_on_fail)
ChangeTurf(/turf/open/space) //Sephora - Multiz explosions
ChangeTurf(/turf/open/space) //nsv13 - Multiz explosions
return FALSE
if(init)
vis_contents += T
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/simulated/floor/plating.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
name = "plating"
icon_state = "plating"
intact = FALSE
baseturfs = /turf/open/openspace //Sephora - Multiz explosions
baseturfs = /turf/open/openspace //nsv13 - Multiz explosions
footstep = FOOTSTEP_PLATING
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
buttons_locked = sanitize_integer(buttons_locked, 0, 1, initial(buttons_locked))
windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing))
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, 105164000, initial(toggles)) //Sephora - PREFERENCES IMPORTANT! When you add a new toggle, you have to double this number. Thank you byond, VERY cool.
toggles = sanitize_integer(toggles, 0, 105164000, initial(toggles)) //nsv13 - PREFERENCES IMPORTANT! When you add a new toggle, you have to double this number. Thank you byond, VERY cool.
clientfps = sanitize_integer(clientfps, 0, 1000, 0)
parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/_job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
var/list/mind_traits // Traits added to the mind of the mob assigned this job

var/display_order = JOB_DISPLAY_ORDER_DEFAULT
var/display_rank = "PVT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
var/display_rank = "PVT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

//Only override this proc
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
//do actions on H but send messages to M as the key may not have been transferred_yet
if(ishuman(H)) //Don't give AIs a rank
H.fully_replace_character_name(H.real_name, "[display_rank] [H.real_name]") //Sephora - Visibly display player ranks with their names.
H.fully_replace_character_name(H.real_name, "[display_rank] [H.real_name]") //nsv13 - Visibly display player ranks with their names.
if(mind_traits)
for(var/t in mind_traits)
ADD_TRAIT(H.mind, t, JOB_TRAIT)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
exp_type_department = EXP_TYPE_SILICON
display_order = JOB_DISPLAY_ORDER_AI
var/do_special_check = TRUE
display_rank = "CPU" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CPU" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev


/datum/job/ai/equip(mob/living/carbon/human/H, visualsOnly, announce, latejoin, datum/outfit/outfit_override, client/preference_source = null)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/atmospheric_technician.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_ENG
display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN
display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/atmos
name = "Atmospheric Technician"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/bartender.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
display_order = JOB_DISPLAY_ORDER_BARTENDER
display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/bartender
name = "Bartender"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/botanist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
display_order = JOB_DISPLAY_ORDER_BOTANIST
display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/botanist
name = "Botanist"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
mind_traits = list(TRAIT_DISK_VERIFIER)

display_order = JOB_DISPLAY_ORDER_CAPTAIN
display_rank = "CPT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CPT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/job/captain/get_access()
return get_all_accesses()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cargo_technician.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
paycheck_department = ACCOUNT_CAR

display_order = JOB_DISPLAY_ORDER_CARGO_TECHNICIAN
display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/cargo_tech
name = "Cargo Technician"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chaplain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
paycheck_department = ACCOUNT_CIV

display_order = JOB_DISPLAY_ORDER_CHAPLAIN
display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/job/chaplain/after_spawn(mob/living/H, mob/M)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chemist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
paycheck_department = ACCOUNT_MED

display_order = JOB_DISPLAY_ORDER_CHEMIST
display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/chemist
name = "Chemist"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_engineer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
paycheck_department = ACCOUNT_ENG

display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER
display_rank = "WO" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/ce
name = "Chief Engineer"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_medical_officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
paycheck_department = ACCOUNT_MED

display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER
display_rank = "WO" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/cmo
name = "Chief Medical Officer"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/clown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
paycheck_department = ACCOUNT_SRV

display_order = JOB_DISPLAY_ORDER_CLOWN
display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev


/datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
paycheck_department = ACCOUNT_SRV

display_order = JOB_DISPLAY_ORDER_COOK
display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/cook
name = "Cook"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/curator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
paycheck_department = ACCOUNT_CIV

display_order = JOB_DISPLAY_ORDER_CURATOR
display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/outfit/job/curator
name = "Curator"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cyborg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
exp_type = EXP_TYPE_CREW

display_order = JOB_DISPLAY_ORDER_CYBORG
display_rank = "CPU" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev
display_rank = "CPU" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev

/datum/job/cyborg/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source = null)
if(visualsOnly)
Expand Down
Loading

0 comments on commit 6a99eb8

Please sign in to comment.