cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1421 from Erthilo/master

Browse Source 
Reverts job limit changes + Fixes
This commit is contained in:
CIB
2012-06-30 02:09:39 -07:00
parent e76ad30b53 a6a2e57980
commit 3c4c77187c
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+1 -1
View File
@@ -65,7 +65,7 @@
flag = BOTANIST
department_flag = CIVILIAN
faction = "Station"
total_positions = 2
total_positions = 3
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#dddddd"
code/game/jobs/job/engineering.dm
+2 -2
View File
@@ -76,7 +76,7 @@
flag = ATMOSTECH
department_flag = ENGSEC
faction = "Station"
total_positions = 2
total_positions = 3
spawn_positions = 2
supervisors = "the chief engineer"
selection_color = "#fff5cc"
@@ -106,7 +106,7 @@
flag = ROBOTICIST
department_flag = ENGSEC
faction = "Station"
total_positions = 1
total_positions = 2
spawn_positions = 1
supervisors = "the chief engineer and research director"
selection_color = "#fff5cc"
code/game/jobs/job/medical.dm
+4 -4
View File
@@ -76,8 +76,8 @@
flag = CHEMIST
department_flag = MEDSCI
faction = "Station"
total_positions = 1
spawn_positions = 1
total_positions = 2
spawn_positions = 2
supervisors = "the chief medical officer"
selection_color = "#ffeef0"
@@ -101,8 +101,8 @@
flag = GENETICIST
department_flag = MEDSCI
faction = "Station"
total_positions = 1
spawn_positions = 1
total_positions = 2
spawn_positions = 2
supervisors = "the chief medical officer and research director"
selection_color = "#ffeef0"
config/alienwhitelist.txt
+1
View File
@@ -1,4 +1,5 @@
botanistpower - Tajaran
bowlsoldier - Tajaran
bluefishie - Skrell
deciusreln - Skrell
densane - Skrell
html/changelog.html
+8
View File
@@ -57,6 +57,14 @@ Stuff which is in development and not yet visible to players or just code relate
should be listed in the changelog upon commit though. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<h2 class="date">29 June 2012</h2>
<h3 class="author">Erthilo updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Raises job limits for Botanists, Atmospheric Technicnians, Roboticists, Chemists, and Geneticists.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">27 June 2012</h2>
<h3 class="author">Erthilo updated:</h3>
maps/tgstation.2.0.8.dmm
+2 -2
View File
@@ -5321,7 +5321,7 @@
"bYq" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
"bYr" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
"bYs" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/virology)
"bYt" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
"bYt" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
"bYu" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/closet/crate,/obj/item/device/multitool,/obj/item/device/assembly/prox_sensor,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bYv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bYw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/light/small{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -9229,7 +9229,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqaMEauraMEaLpaMFauraMGaMHauraMEaLpaJhaurauraMIaMJaMJaMJaMJaMJaMKaurauraGraLsaMLaMMaMNaMOaMPaMQaMRaMSaMTaMUaMUaMVaMWaMXaMYaMZaNaaNbaNcaNcaNcaNdaNeaJjaNfaNfaNfaNfaNfaNgaNhaNfaNfaNfaDNaDNaNiaNjaaaaaaaaaaaaaaaaaaaaaaNkaNlaNmaNnaNoaNpaNqaNpaNraNsaNtaNuaNkaaaaaaaaaaaaaaaaaaaaaaNvaLZaGMaGMaNwaNxaIxaIxaNyaNzaIxaIxaNAaIEaIxaIxaIGaNBaNCaNDaNEaNFaNFaNGaNHaHkaNIaMmaHoaNJaNJaNJaNJaLaaNKaHnaLbaLcaIVaKaaNLaNMaMuaNNaKcaLhaLiaHvaHwaLhaNOaMyaNPaNQaNRaNSaNTaNUaNVaaeaaeaaaaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarTaaaaaaaaaaaaaaaaaaavaauraNWaurauraurauraurauraNWaurauraJhaurauraNXaurauraNYaNZauraOaaObauraOcaOdaOeaOfaOgaLvaOhaMUaMUaMUaMUaMUaMUaOiaMUaMUaMUaOjaNaaOkaOlaOlaOlaOmaNeaOnaOoaOpaOqaNfaOraOsaOsaOtaOuaOvaGMaGMaLJaNjaaaaaaaaaaaaaNkaNkaNkaNkaOwaOxaOyaOzaOAaOBaOCaODaOEaOFaOGaNkaNkaNkaNkaaaaaaaaaaaaaNvaLZaGMaGMaGUaOHaOHaIxaOIaNAaNAaOJaNAaIEaOHaOHaIGaOKaOLaOMaONaOOaOPaOQaORaHkaNIaMmaHoaOSaOTaOTaOTaOUaOVaHnaOWaOXaOYaOZaPaaPbaPcaPdaKcaKdaKeaHvaHwaKdaKfaMyaPeaPfaNRaNRaNRaPgaPhaMCaMCaPiaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarUarkaPjaPkaPkaPkaPkaPkaPkaPkaxearUarkaPlaPmaPnaPnaPnaPoaPnaPnaPnaPpaPnaPpaLsaMLaPqaOgaPraPsaMUaMUaPtaPuaPvaPuaPtaMUaMUaMUaPwaNaaPxaOlaOlaOlaPyaNeaPzaOoaPAaPBaPCaPDaOsaOsaOsaOsaPEaPFaGMaLJaPGaLMaLIaNkaNkaNkaPHaPIaPJaPKaPLaPLaPMaPNaPLaPMaPNaPLaPOaPPaPQaPRaPSaNkaNkaNkaLIaGIaPTaLZaGMaGMaKJaIxaIxaPUaIBaPUaIBaPUaIBaPVaIxaPWaPXaPYaFNaMgaPZaJOaJOaQaaQbaHkaQcaQdaQeaQfaQgaQhaQiaQjaQkaQlaQmaMraIVaKaaQnaQoaMuaQpaKcaLhaLiaHvaHwaLhaQqaMyaQraPfaNRaQsaQtaQuaQvaQwaQxaQyaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaaeaQAawZavdauraQBaQCaQDaQEaQFaQGaQHaQIaQJaQKaQLaQLaQMaQNaQOaQPaMUaMUaPtaPvaPvaPvaPtaMUaMUaMUaMZaNaaQQaQRaQSaQRaQTaNeaQUaQVaQWaQXaQYaQZaOsaOsaOsaOsaPEaGMaGMaLJaRaaRbaRcaRdaReaNkaRfaOBaPLaRgaPLaPLaPLaPLaRhaPLaPLaPLaRiaRjaRjaRkaRlaNkaReaRdaRmaRnaRaaLZaGMaRoaMaaRpaRpaIBaRqaIBaPUaIBaRqaRraRpaRpaIGaIHaHfaMiaMhaJOaJOaMjaRsaHkaRtaRuaRvaRvaRvaRwaIOaRxaRyaRzaRAaRBaRCaRDaREaRFaRFaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaPfaNRaRQaNRaPgaRRaMCaMCaPiaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaaeaQAawZavdauraQBaQCaQDaQEaQFaQGaQHaQIaQJaQKaQLaQLaQMaQNaQOaQPaMUaMUaPtaPvaPvaPvaPtaMUaMUaMUaMZaNaaQQaQRaQSaQRaQTaNeaQUaQVaQWaQXaQYaQZaOsaOsaOsaOsaPEaGMaGMaLJaRaaRbaRcaRdaReaNkaRfaOBaPLaRgaPLaPLaPLaPLaRhaPLaPLaPLaRiaRjaRjaRkaRlaNkaReaRdaRmaRnaRaaLZaGMaRoaMaaRpaRpaIBaRqaIBaPUaIBaRqaRraRpaRpaIGaIHaHfaMiaPZaJOaJOaQaaRsaHkaRtaRuaRvaRvaRvaRwaIOaRxaRyaRzaRAaRBaRCaRDaREaRFaRFaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaPfaNRaRQaNRaPgaRRaMCaMCaPiaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaRSaRTaRUavYaRVaRWaRXaRYaRZaSaaSbaRYaScaRYaSdaSeaSfaSgaShaLvaSiaSjaMUaSkaMUaMUaMUaMUaMUaMUaSlaSmaSnaSoaSpaSqaSpaSraSsaStaSuaSvaSwaNfaSxaSyaSzaSAaSBaSCaGMaGMaGMaGMaGMaSDaSEaSFaSGaSHaSIaPLaPLaSJaSKaSLaSMaSNaSOaSPaSQaSRaRjaSHaSSaRjaSGaSFaSTaSUaSVaGMaGMaGMaGMaNwaKKaIxaSWaSXaSYaSZaSWaTaaTbaIxaTcaTdaTeaHfaMiaMhaJOaJOaMjaTfaHkaRtaTgaThaTiaTjaTkaHoaTlaTmaTnaToaTpaTqaTraTsaMuaMuaTtaTuaTvaTwaHvaTxaTyaTzaTAaTBaPfaNRaRQaNRaTCaNVaaaaaeaaeaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaTDaTEaTFaTGauraPpaTHaTIaTJaTJaTJaTIaTKaTLaPnaTMaTNaTOaShaTPaTPaTPaTQaTPaTRaMUaTSaTTaTUaTVaTWaMZaNeaTXaTYaTYaTZaPyaNeaUaaUbaUcaUdaUeaUfaUgaUgaUgaUhaNfaGMaGMaUiaUjaUkaUlaUmaReaUnaUoaUpaUqaUraNkaNkaNkaNkaNkaUsaUtaUuaUvaUwaSJaUxaUyaNkaReaUmaUzaUAaUjaKGaGMaGMaGUaUBaUBaIBaUCaIBaPUaIBaUCaRraUBaUBaIGaUDaOLaUEaUFaUGaUHaUIaUJaUKaULacQaUMaUNaUOaUPaHoaUQaUQaHoaURaUSaUTaUUaMuaMuaMuaUVaKcaMwaKeaUWaUXaUXaUYaUZaVaaVbaNRaVcaNRaVdaNVaaeachaaaaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaRSaVeaRUaVfauraVgaTIaVhaTIaTJaTIaTIaViaTJaPnaVjaMLaTOaShaVkaVlaVmaVnaTPaTPaVoaTPaTPaVpaVqaVraVsaLCaVtaLCaLCaVuaLCaLCaVvaVwaVxaVyaVyaVzaVyaVAaVBaVCaVxaGMaGMaVDaVEaVFaVFaVFaVFaVGaVHaVIaVHaVHaVJaVJaVJaVJaVJaVKaVJaVJaVLaVMaVMaVNaVMaVMaVMaVMaVMaLIaVOaVPaGMaGMaGUaVQaVRaVSaVTaVUaVVaVUaVVaVWaVXaVYaIGaMmaVZaWaaWbaWcaWdaWbaWeaEfaWfayPaWgaWhaWiaWjaUMaWkaWkaWlaWkaWmaTqaWnaWoaTtaWpaWqaKcaWraTwaTvaTwaTvaWsaWtaWuaNRaNRaRQaNRaTCaNVaaaaaeaaeaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa