diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 66322cea927..9c1ad56159b 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -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" diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index c3f09ff8ffb..5417d287f91 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -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" diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 79275c114f8..333d958a1cb 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -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" diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 8d27d60f589..a9968503e5a 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,4 +1,5 @@ botanistpower - Tajaran +bowlsoldier - Tajaran bluefishie - Skrell deciusreln - Skrell densane - Skrell diff --git a/html/changelog.html b/html/changelog.html index 080ab947824..ce5b79ed33c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -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. --> +
+

29 June 2012

+

Erthilo updated:

+ +
+

27 June 2012

Erthilo updated:

diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 185707964bc..5f4c4be1300 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -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