From a2ed0517e4b5ec2db3872fc6d34ec9b92a5616bc Mon Sep 17 00:00:00 2001 From: Erthilo Date: Fri, 29 Jun 2012 19:13:45 +0100 Subject: [PATCH 1/4] Reverts job numbers to default. Added spawn points to map. --- code/game/jobs/job/civilian.dm | 2 +- code/game/jobs/job/engineering.dm | 4 ++-- code/game/jobs/job/medical.dm | 8 ++++---- maps/tgstation.2.0.8.dmm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 9a5182520a2..8cbb6ba1ad0 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -9228,7 +9228,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqaMEauraMEaLpaMFauraMGaMHauraMEaLpaJhaurauraMIaMJaMJaMJaMJaMJaMKaurauraGraLsaMLaMMaMNaMOaMPaMQaMRaMSaMTaMUaMUaMVaMWaMXaMYaMZaNaaNbaNcaNcaNcaNdaNeaJjaNfaNfaNfaNfaNfaNgaNhaNfaNfaNfaDNaDNaNiaNjaaaaaaaaaaaaaaaaaaaaaaNkaNlaNmaNnaNoaNpaNqaNpaNraNsaNtaNuaNkaaaaaaaaaaaaaaaaaaaaaaNvaLZaGMaGMaNwaNxaIxaIxaNyaNzaIxaIxaNAaIEaIxaIxaIGaNBaNCaNDaNEaNFaNFaNGaNHaHkaNIaMmaHoaNJaNJaNJaNJaLaaNKaHnaLbaLcaIVaKaaNLaNMaMuaNNaKcaLhaLiaHvaHwaLhaNOaMyaNPaNQaNRaNSaNTaNUaNVaaeaaeaaaaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarTaaaaaaaaaaaaaaaaaaavaauraNWaurauraurauraurauraNWaurauraJhaurauraNXaurauraNYaNZauraOaaObauraOcaOdaOeaOfaOgaLvaOhaMUaMUaMUaMUaMUaMUaOiaMUaMUaMUaOjaNaaOkaOlaOlaOlaOmaNeaOnaOoaOpaOqaNfaOraOsaOsaOtaOuaOvaGMaGMaLJaNjaaaaaaaaaaaaaNkaNkaNkaNkaOwaOxaOyaOzaOAaOBaOCaODaOEaOFaOGaNkaNkaNkaNkaaaaaaaaaaaaaNvaLZaGMaGMaGUaOHaOHaIxaOIaNAaNAaOJaNAaIEaOHaOHaIGaOKaOLaOMaONaOOaOPaOQaORaHkaNIaMmaHoaOSaOTaOTaOTaOUaOVaHnaOWaOXaOYaOZaPaaPbaPcaPdaKcaKdaKeaHvaHwaKdaKfaMyaPeaPfaNRaNRaNRaPgaPhaMCaMCaPiaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarUarkaPjaPkaPkaPkaPkaPkaPkaPkaxearUarkaPlaPmaPnaPnaPnaPoaPnaPnaPnaPpaPnaPpaLsaMLaPqaOgaPraPsaMUaMUaPtaPuaPvaPuaPtaMUaMUaMUaPwaNaaPxaOlaOlaOlaPyaNeaPzaOoaPAaPBaPCaPDaOsaOsaOsaOsaPEaPFaGMaLJaPGaLMaLIaNkaNkaNkaPHaPIaPJaPKaPLaPLaPMaPNaPLaPMaPNaPLaPOaPPaPQaPRaPSaNkaNkaNkaLIaGIaPTaLZaGMaGMaKJaIxaIxaPUaIBaPUaIBaPUaIBaPVaIxaPWaPXaPYaFNaMgaPZaJOaJOaQaaQbaHkaQcaQdaQeaQfaQgaQhaQiaQjaQkaQlaQmaMraIVaKaaQnaQoaMuaQpaKcaLhaLiaHvaHwaLhaQqaMyaQraPfaNRaQsaQtaQuaQvaQwaQxaQyaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaaeaQAawZavdauraQBaQCaQDaQEaQFaQGaQHaQIaQJaQKaQLaQLaQMaQNaQOaQPaMUaMUaPtaPvaPvaPvaPtaMUaMUaMUaMZaNaaQQaQRaQSaQRaQTaNeaQUaQVaQWaQXaQYaQZaOsaOsaOsaOsaPEaGMaGMaLJaRaaRbaRcaRdaReaNkaRfaOBaPLaRgaPLaPLaPLaPLaRhaPLaPLaPLaRiaRjaRjaRkaRlaNkaReaRdaRmaRnaRaaLZaGMaRoaMaaRpaRpaIBaRqaIBaPUaIBaRqaRraRpaRpaIGaIHaHfaMiaMhaJOaJOaMjaRsaHkaRtaRuaRvaRvaRvaRwaIOaRxaRyaRzaRAaRBaRCaRDaREaRFaRFaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaPfaNRaRQaNRaPgaRRaMCaMCaPiaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaaeaQAawZavdauraQBaQCaQDaQEaQFaQGaQHaQIaQJaQKaQLaQLaQMaQNaQOaQPaMUaMUaPtaPvaPvaPvaPtaMUaMUaMUaMZaNaaQQaQRaQSaQRaQTaNeaQUaQVaQWaQXaQYaQZaOsaOsaOsaOsaPEaGMaGMaLJaRaaRbaRcaRdaReaNkaRfaOBaPLaRgaPLaPLaPLaPLaRhaPLaPLaPLaRiaRjaRjaRkaRlaNkaReaRdaRmaRnaRaaLZaGMaRoaMaaRpaRpaIBaRqaIBaPUaIBaRqaRraRpaRpaIGaIHaHfaMiaPZaJOaJOaQaaRsaHkaRtaRuaRvaRvaRvaRwaIOaRxaRyaRzaRAaRBaRCaRDaREaRFaRFaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaPfaNRaRQaNRaPgaRRaMCaMCaPiaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaRSaRTaRUavYaRVaRWaRXaRYaRZaSaaSbaRYaScaRYaSdaSeaSfaSgaShaLvaSiaSjaMUaSkaMUaMUaMUaMUaMUaMUaSlaSmaSnaSoaSpaSqaSpaSraSsaStaSuaSvaSwaNfaSxaSyaSzaSAaSBaSCaGMaGMaGMaGMaGMaSDaSEaSFaSGaSHaSIaPLaPLaSJaSKaSLaSMaSNaSOaSPaSQaSRaRjaSHaSSaRjaSGaSFaSTaSUaSVaGMaGMaGMaGMaNwaKKaIxaSWaSXaSYaSZaSWaTaaTbaIxaTcaTdaTeaHfaMiaMhaJOaJOaMjaTfaHkaRtaTgaThaTiaTjaTkaHoaTlaTmaTnaToaTpaTqaTraTsaMuaMuaTtaTuaTvaTwaHvaTxaTyaTzaTAaTBaPfaNRaRQaNRaTCaNVaaaaaeaaeaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaTDaTEaTFaTGauraPpaTHaTIaTJaTJaTJaTIaTKaTLaPnaTMaTNaTOaShaTPaTPaTPaTQaTPaTRaMUaTSaTTaTUaTVaTWaMZaNeaTXaTYaTYaTZaPyaNeaUaaUbaUcaUdaUeaUfaUgaUgaUgaUhaNfaGMaGMaUiaUjaUkaUlaUmaReaUnaUoaUpaUqaUraNkaNkaNkaNkaNkaUsaUtaUuaUvaUwaSJaUxaUyaNkaReaUmaUzaUAaUjaKGaGMaGMaGUaUBaUBaIBaUCaIBaPUaIBaUCaRraUBaUBaIGaUDaOLaUEaUFaUGaUHaUIaUJaUKaULacQaUMaUNaUOaUPaHoaUQaUQaHoaURaUSaUTaUUaMuaMuaMuaUVaKcaMwaKeaUWaUXaUXaUYaUZaVaaVbaNRaVcaNRaVdaNVaaeachaaaaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaQzaRSaVeaRUaVfauraVgaTIaVhaTIaTJaTIaTIaViaTJaPnaVjaMLaTOaShaVkaVlaVmaVnaTPaTPaVoaTPaTPaVpaVqaVraVsaLCaVtaLCaLCaVuaLCaLCaVvaVwaVxaVyaVyaVzaVyaVAaVBaVCaVxaGMaGMaVDaVEaVFaVFaVFaVFaVGaVHaVIaVHaVHaVJaVJaVJaVJaVJaVKaVJaVJaVLaVMaVMaVNaVMaVMaVMaVMaVMaLIaVOaVPaGMaGMaGUaVQaVRaVSaVTaVUaVVaVUaVVaVWaVXaVYaIGaMmaVZaWaaWbaWcaWdaWbaWeaEfaWfayPaWgaWhaWiaWjaUMaWkaWkaWlaWkaWmaTqaWnaWoaTtaWpaWqaKcaWraTwaTvaTwaTvaWsaWtaWuaNRaNRaRQaNRaTCaNVaaaaaeaaeaHzaHzaHzaHzaHzaHzaHzaHzaHzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 341354a3e8f78fd5ee6f197c999742f5d97bcb37 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Fri, 29 Jun 2012 19:17:55 +0100 Subject: [PATCH 2/4] Changelog. --- html/changelog.html | 8 ++++++++ 1 file changed, 8 insertions(+) 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:

+
    +
  • Raises job limits for Botanists, Atmospheric Technicnians, Roboticists, Chemists, and Geneticists.
    • +
+
+

27 June 2012

Erthilo updated:

From 3127b39962b2de44118d63ec0649cbaf0937aec0 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Fri, 29 Jun 2012 21:45:55 +0100 Subject: [PATCH 3/4] Adds Bowlsoldier to Tajaran whitelist. --- config/alienwhitelist.txt | 1 + 1 file changed, 1 insertion(+) 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 From a6a2e579809ddfed58ec65c4300fd5e72afaac28 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Fri, 29 Jun 2012 22:12:22 +0100 Subject: [PATCH 4/4] Fixed virology vent. --- maps/tgstation.2.0.8.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 3924d0098fe..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)