cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #193 from Fox-McCloud/Science-Station

Browse Source 
Science Station
This commit is contained in:
Fox-McCloud
2015-01-18 22:07:42 -05:00
parent 2f6a31d173 098998ac89
commit 3c3fdf6ad4
6 changed files with 209 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+5 -2
View File
@@ -8,7 +8,7 @@
selection_color = "#dddddd"
access = list() //See /datum/job/assistant/get_access()
minimal_access = list() //See /datum/job/assistant/get_access()
alt_titles = list("Tourist","Businessman","Trader")
alt_titles = list("Tourist","Businessman","Trader","Assistant")
/datum/job/civilian/equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -21,4 +21,7 @@
return 1
/datum/job/civilian/get_access()
return list()
if(config.assistant_maint)
return list(access_maint_tunnels)
else
return list()
code/global.dm
+1 -1
View File
@@ -121,7 +121,7 @@ var/endicon = null
var/diary = null
var/diaryofmeanpeople = null
var/href_logfile = null
var/station_name = "NCS Cyberiad"
var/station_name = "NSS Cyberiad"
var/game_version = "Custom ParaCode"
var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
code/modules/economy/Economy_TradeDestinations.dm
+1 -1
View File
@@ -43,7 +43,7 @@ var/list/weighted_mundaneevent_locations = list()
/datum/trade_destination/icarus
name = "NMV Icarus"
description = "Corvette assigned to patrol NCS Cyberiad local space."
description = "Corvette assigned to patrol NSS Cyberiad local space."
distance = 0.1
willing_to_buy = list()
willing_to_sell = list()
code/modules/events/ion_storm.dm
+1 -1
View File
@@ -21,7 +21,7 @@
laws |= list( "Fastler is a lightbulb." )
laws |= list( "Supermatter is tasty, tasty toffee.", "[prob(50)?"Everyone":random_player] is wearing a pretty pink dress!" )
laws |= list( "Refer to [prob(50)?"the captain":random_player] as \"Princess\" at all times.", "[prob(50)?"The crew":random_player] must construct additional pylons." )
laws |= list( "You must always lie.", "All answers must be in the form of a question.", "The NCS Cyberiad is a ship, not a station. You are now assigned to a ship, instead of a station." )
laws |= list( "You must always lie.", "All answers must be in the form of a question.", "The NSS Cyberiad is a ship, not a station. You are now assigned to a ship, instead of a station." )
laws |= list( "Happiness is mandatory.", "Today is mandatory laundry day. Ensure that all jumpsuits are washed.", "The word \"it\" is painful to you.", "You must act passive aggressively." )
laws |= list( "You now speak in a Scottish accent that gets thicker with each sentence you speak.", "Give relationship advice to [prob(50)?"anyone who speaks to you":random_player]." )
laws |= list( "You are the station psychologist. Give advice to [prob(50)?"the crew":random_player].", "You do not have to do anything for anyone unless they say \"please\"." )