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

Merge pull request #10333 from PsiOmegaDelta/dev-freeze

Browse Source 
Master -> Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-07-27 10:08:23 +02:00
parent fbf7b736cf 0838de3ba2
commit e48e0215da
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/access.dm
-6
View File
@@ -50,8 +50,6 @@
/var/const/access_mining = 48
/var/const/access_mining_office = 49 //not in use
/var/const/access_mailsorting = 50
/var/const/access_mint = 51
/var/const/access_mint_vault = 52
/var/const/access_heads_vault = 53
/var/const/access_mining_station = 54
/var/const/access_xenobiology = 55
@@ -311,10 +309,6 @@
return "Mining Office"
if(access_mailsorting)
return "Cargo Office"
if(access_mint)
return "Mint"
if(access_mint_vault)
return "Mint Vault"
if(access_heads_vault)
return "Main Vault"
if(access_mining_station)
code/game/jobs/job/assistant.dm
+1 -1
View File
@@ -10,7 +10,7 @@
selection_color = "#dddddd"
access = list() //See /datum/job/assistant/get_access()
minimal_access = list() //See /datum/job/assistant/get_access()
alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Security Cadet","Visitor")
alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Visitor")
/datum/job/assistant/equip(var/mob/living/carbon/human/H)
if(!H) return 0
code/game/jobs/job/civilian.dm
+5 -5
View File
@@ -97,8 +97,8 @@
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
equip(var/mob/living/carbon/human/H)
@@ -124,7 +124,7 @@
spawn_positions = 2
supervisors = "the quartermaster and the head of personnel"
selection_color = "#dddddd"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
@@ -149,8 +149,8 @@
spawn_positions = 3
supervisors = "the quartermaster and the head of personnel"
selection_color = "#dddddd"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting)
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
minimal_access = list(access_mining, access_mining_station, access_mailsorting)
alt_titles = list("Drill Technician","Prospector")
equip(var/mob/living/carbon/human/H)
code/game/machinery/bots/mulebot.dm
+1 -1
View File
@@ -59,7 +59,7 @@
..()
wires = new(src)
botcard = new(src)
botcard.access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
botcard.access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
cell = new(src)
cell.charge = 2000
cell.maxcharge = 2000
html/changelog.html
+7
View File
@@ -56,6 +56,13 @@
-->
<div class="commit sansserif">
<h2 class="date">27 July 2015</h2>
<h3 class="author">Kelenius updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Borg shaker now works similarly to hypospray. It generates reagents that can be poured into glasses.</li>
<li class="bugfix">Therefore, they can no longer duplicate rare reagents such as phoron.</li>
</ul>
<h2 class="date">14 July 2015</h2>
<h3 class="author">HarpyEagle updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+5
View File
@@ -1975,3 +1975,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
PsiOmegaDelta:
- tweak: Ninjas can no longer teleport unto turfs that contain solid objects.
- tweak: Wizards can no longer etheral jaunt unto turfs that contain solid objects.
2015-07-27:
Kelenius:
- tweak: Borg shaker now works similarly to hypospray. It generates reagents that
can be poured into glasses.
- bugfix: Therefore, they can no longer duplicate rare reagents such as phoron.
html/changelogs/Kelenius-ofBorgsAndShakers.yml
-6
View File
@@ -1,6 +0,0 @@
author: Kelenius
delete-after: True
changes:
- tweak: "Borg shaker now works similarly to hypospray. It generates reagents that can be poured into glasses."
- bugfix: "Therefore, they can no longer duplicate rare reagents such as phoron."