Merge pull request #5124 from Unfit/hohohaha

Wheelchairs
This commit is contained in:
d3athrow
2015-07-03 11:56:10 -05:00
14 changed files with 182 additions and 23 deletions

View File

@@ -1012,6 +1012,14 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
access = access_medical
group = "Medical"
/datum/supply_packs/wheelchair
name = "Wheelchair Crate"
contains = list(/obj/structure/stool/bed/chair/vehicle/wheelchair)
cost = 40
containertype = /obj/structure/closet/crate/medical
containername = "Wheelchair Crate"
group = "Medical"
//////SCIENCE//////
/datum/supply_packs/robotics

View File

@@ -440,6 +440,13 @@ var/global/datum/controller/occupations/job_master
var/obj/item/clothing/glasses/G = H.glasses
G.prescription = 1
// H.update_icons()
//Gives wheelchair to those missing both of their feet
var/datum/organ/external/left_leg = H.get_organ("l_foot")
var/datum/organ/external/right_leg = H.get_organ("r_foot")
if( (!left_leg || left_leg.status & ORGAN_DESTROYED) && (!right_leg || right_leg.status & ORGAN_DESTROYED) ) //If the character is missing both of his feet
var/obj/structure/stool/bed/chair/vehicle/wheelchair/W = new(H.loc)
W.buckle_mob(H,H)
return 1

View File

@@ -22,11 +22,12 @@
density = 1
nick = "honkin' ride" //For fucks sake, well then
flags = OPENCONTAINER
max_health = 100 //Bananium sheets increases maximum health by 20
var/activated = 0 //Honk to activate, it stays active while you sit in it, and will deactivate when you unbuckle
var/mode = MODE_NORMAL
//Modes 1 and 2 consume extra fuel
//Use bananium coins to cycle between modes
var/max_health = 100 //Bananium sheets increases maximum health by 20
var/max_health_top = 1000 //That's 45 sheets of Bananium, as much as four tens and five, and that's terrible
var/printing_text = "nothing" //What is printed on the ground in mode 1
var/printing_pos //'Rune' draws runes and 'graffiti' draws graffiti, other draws text

View File

@@ -25,6 +25,7 @@
var/empstun = 0
var/health = 100
var/max_health = 100
var/destroyed = 0
var/inertia_dir = 0
@@ -35,6 +36,14 @@
var/obj/item/key/mykey
var/vin=null
var/datum/delay_controller/move_delayer = new(1,ARBITRARILY_LARGE_NUMBER) //See setup.dm, 12
var/movement_delay = 0 //Speed of the vehicle decreases as this value increases. Anything above 6 is slow, 1 is fast and 0 is very fast
/obj/structure/stool/bed/chair/vehicle/proc/getMovementDelay()
return movement_delay
/obj/structure/stool/bed/chair/vehicle/proc/delayNextMove(var/delay, var/additive=0)
move_delayer.delayNext(delay,additive)
/obj/structure/stool/bed/chair/vehicle/New()
..()
@@ -90,9 +99,13 @@
if(user)
user << "<span class='warning'>\the [src] is unresponsive.</span>"
return
if(move_delayer.blocked())
return
if(istype(src.loc, /turf/space))
if(!src.Process_Spacemove(0)) return
step(src, direction)
delayNextMove(getMovementDelay())
update_mob()
handle_rotation()
/*
@@ -207,8 +220,13 @@
if(buckled_mob.buckled == src)
buckled_mob.forceMove(loc)
/obj/structure/stool/bed/chair/vehicle/buckle_mob(mob/M, mob/user)
/obj/structure/stool/bed/chair/vehicle/proc/can_buckle(mob/M, mob/user)
if(M != user || !ishuman(user) || !Adjacent(user) || user.restrained() || user.lying || user.stat || user.buckled || destroyed)
return 0
return 1
/obj/structure/stool/bed/chair/vehicle/buckle_mob(mob/M, mob/user)
if(!can_buckle(M,user))
return
unbuckle()
@@ -231,12 +249,15 @@
buckled_mob.pixel_y = 0
..()
/obj/structure/stool/bed/chair/vehicle/handle_rotation()
/obj/structure/stool/bed/chair/vehicle/handle_layer()
if(dir == SOUTH)
layer = FLY_LAYER
else
layer = OBJ_LAYER
/obj/structure/stool/bed/chair/vehicle/handle_rotation()
handle_layer()
if(buckled_mob)
if(buckled_mob.loc != loc)
buckled_mob.buckled = null //Temporary, so Move() succeeds.
@@ -303,7 +324,7 @@
HealthCheck()
/obj/structure/stool/bed/chair/vehicle/proc/HealthCheck()
if(health > 100) health = 100
if(health > max_health) health = max_health
if(health <= 0 && !destroyed)
die()
@@ -330,4 +351,4 @@
if(istype(obstacle, /obj/structure))// || istype(obstacle, /mob/living)
if(!obstacle.anchored)
obstacle.Move(get_step(obstacle,src.dir))
..()
..()

View File

@@ -0,0 +1,122 @@
/obj/structure/stool/bed/chair/vehicle/wheelchair
name = "wheelchair"
nick = "cripplin' ride"
desc = "A chair with fitted wheels. Used by handicapped to make life easier, however it still requires hands to drive."
icon = 'icons/obj/objects.dmi'
icon_state = "wheelchair"
anchored = 0
movement_delay = 3
health = 50
max_health = 50
var/image/wheel_overlay
/obj/structure/stool/bed/chair/vehicle/wheelchair/New()
.=..()
wheel_overlay = image("icons/obj/objects.dmi", "[icon_state]_overlay", MOB_LAYER + 0.1)
/obj/structure/stool/bed/chair/vehicle/wheelchair/buckle_mob()
.=..()
update_icon()
/obj/structure/stool/bed/chair/vehicle/wheelchair/unbuckle()
.=..()
update_icon()
/obj/structure/stool/bed/chair/vehicle/wheelchair/update_icon()
..()
if(buckled_mob)
overlays |= wheel_overlay
else
overlays -= wheel_overlay
/obj/structure/stool/bed/chair/vehicle/wheelchair/can_buckle(mob/M, mob/user)
if(M != user || !Adjacent(user) || (!ishuman(user) && !isalien(user) && !ismonkey(user)) || user.restrained() || user.stat || user.buckled || destroyed) //Same as vehicle/can_buckle, minus check for user.lying as well as allowing monkey and ayliens
return 0
return 1
/obj/structure/stool/bed/chair/vehicle/wheelchair/proc/check_hands(var/mob/user)
//Returns a number from 0 to 4 depending on usability of user's hands
//Human with no hands gets 0
//Human with one hand holding something gets 1
//Human with one empty hand gets 2
//Human with two hands both holding something gets 2
//Human with one empty and one full hand gets 3
//Human with two empty hands gets 4
//Wheelchair's speed depends on the resulting value
var/mob/living/carbon/M = user
if(!M) return 0
var/left_hand_exists = 1
var/right_hand_exists = 1
if(M.handcuffed)
return 0
if(ishuman(M)) //Human check - 0 to 4
var/mob/living/carbon/human/H = user
if(H.l_hand == null) left_hand_exists++ //Check to see if left hand is holding anything
var/datum/organ/external/left_hand = H.get_organ("l_hand")
if(!left_hand)
left_hand_exists = 0
else if(left_hand.status & ORGAN_DESTROYED)
left_hand_exists = 0
if(H.r_hand == null) right_hand_exists++
var/datum/organ/external/right_hand = H.get_organ("r_hand")
if(!right_hand)
right_hand_exists = 0
else if(right_hand.status & ORGAN_DESTROYED)
right_hand_exists = 0
else if( ismonkey(M) || isalien(M) ) //Monkey and alien check - 0 to 2
left_hand_exists = 0
if(user.l_hand == null) left_hand_exists++
right_hand_exists = 0
if(user.r_hand == null) right_hand_exists++
return ( left_hand_exists + right_hand_exists )
/obj/structure/stool/bed/chair/vehicle/wheelchair/getMovementDelay()
//Speed is determined by amount of usable hands and whether they're carrying something
var/hands = check_hands(buckled_mob) //See check_hands() proc above
if(hands <= 0) return 0
return movement_delay * (4 / hands)
/obj/structure/stool/bed/chair/vehicle/wheelchair/relaymove(var/mob/user, direction)
if(!check_key(user))
user << "<span class='warning'>You need at least one hand to use [src]!</span>"
return
return ..()
/obj/structure/stool/bed/chair/vehicle/wheelchair/handle_layer()
if(dir == NORTH)
layer = FLY_LAYER
else
layer = OBJ_LAYER
/obj/structure/stool/bed/chair/vehicle/wheelchair/check_key(var/mob/user)
if(check_hands(user))
return 1
return 0
/obj/structure/stool/bed/chair/vehicle/wheelchair/emp_act(severity)
return
/obj/structure/stool/bed/chair/vehicle/wheelchair/update_mob()
if(buckled_mob)
buckled_mob.dir = dir
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 3
/obj/structure/stool/bed/chair/vehicle/wheelchair/die()
if(buckled_mob)
unbuckle()
getFromPool(/obj/item/stack/sheet/metal, get_turf(src), 4)
getFromPool(/obj/item/stack/rods, get_turf(src), 2)
qdel(src)

View File

@@ -1,4 +1,3 @@
# define ARBITRARILY_LARGE_NUMBER 10000
//////////////////////////////////
// /vg/ MODULARIZED DELAYS - by N3X15
//////////////////////////////////
@@ -7,7 +6,7 @@
/datum/delay_controller
// Delay clamps (for adminbus, effects)
var/min_delay = 1
var/max_delay = ARBITRARILY_LARGE_NUMBER // arbitrary number, should be set to a sane value
var/max_delay = ARBITRARILY_LARGE_NUMBER //See setup.dm, 12
var/next_allowed = 0
@@ -38,7 +37,7 @@
var/datum/delay_controller/move_delayer = new (1,ARBITRARILY_LARGE_NUMBER) // /mob/delayNextMove()
/mob
var/datum/delay_controller/click_delayer = new (1,ARBITRARILY_LARGE_NUMBER) // (Handled in Click())
var/datum/delay_controller/attack_delayer = new (1,ARBITRARILY_LARGE_NUMBER) // delayNextAttack()
var/datum/delay_controller/attack_delayer = new (1,ARBITRARILY_LARGE_NUMBER) // delayNextAttack() See setup.dm, 12
var/datum/delay_controller/special_delayer = new (1,ARBITRARILY_LARGE_NUMBER) // delayNextSpecial()
// Convenience procs.
@@ -56,5 +55,3 @@
if(types & DELAY_MOVE) delayNextMove(delay,additive)
if(types & DELAY_ATTACK) delayNextAttack(delay,additive)
if(types & DELAY_SPECIAL) delayNextSpecial(delay,additive)
# undef ARBITRARILY_LARGE_NUMBER

View File

@@ -9,6 +9,8 @@
#define DEBUG
#define PROFILE_MACHINES // Disable when not debugging.
#define ARBITRARILY_LARGE_NUMBER 10000 //Used in delays.dm and vehicle.dm. Upper limit on delays
#ifdef PROFILE_MACHINES
#define CHECK_DISABLED(TYPE) if(disable_##TYPE) return
var/global/disable_scrubbers = 0

View File

@@ -1,5 +1,5 @@
author: Unid
delete-after: True
changes:
- tweak: AIs can upload photos to newscasters.
- tweak: AIs can rename or delete their stored photos.
- rscadd: Added wheelchairs to the game. Two can be found in medbay, more can be ordered from cargo.
- rscadd: Characters missing both of their feet now spawn with a wheelchair.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 121 KiB

View File

@@ -862,7 +862,7 @@
"aqD" = (/obj/machinery/optable,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
"aqE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"aqF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/bioprinter,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "whitegreencorner"},/area/medical/medbay)
"aqG" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"aqG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/stool/bed/chair/vehicle/wheelchair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"aqH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay2)
"aqI" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"aqJ" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/o2{pixel_x = -2; pixel_y = 4},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
@@ -1310,7 +1310,7 @@
"azj" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/sign/nosmoking_2{pixel_x = -28},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery)
"azk" = (/obj/machinery/camera{c_tag = "Surgery Observation"; dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery)
"azl" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"azm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"azm" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/stool/bed/chair/vehicle/wheelchair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"azn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/cmo)
"azo" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
"azp" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/stamp/cmo,/obj/item/clothing/glasses/hud/health,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
@@ -10246,8 +10246,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaaaaaaaacaacaaaaaaaaaaacaaaaaaaaaaacaacaboaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapsaqWarAaqXarBapsasLasMasMasMasNamaamaasOalTayWalUayWayWayWanxasWamaaacamaawdamaaacaqudDddDfdDeataaquarCatfatfatfatfatfaobathauLatiauLaxQauOauNatjateatlatmapzafZatoaonanyaqKarIatqaqKarPatsadratuatvaaUatwatxatyatzaeqaqSasuatBatCatDatEaslatFatGatHatIatJatKatLatMatNatOasmarRaoKakGatQatRatSatTatUatVatWatXatYatZatXatXauaaubayPavPaxmaxmaswaucaudaueaufaugauhauiaujaukaswaBOaAfaAfaAfaBPaAbaacaaaaaaabeaacabeabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarzaupauqaurausaacauqautausaaaauqauuausaaaarzaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaapsascasHapsasIapsanCauzauzauzauHamaauBauCaCjauHaxCaxCalWamaauGamaamaaacamaauHamaaacaquaquaquauIatkaquasJayVazaayZawhauSaobawiawiawiawiawiaobawjaxRauJauTauTauTauTauTauTamnaqKauVauWaqKadrauYauyasKauyavcavdaveavfavgavhaviasVasfavlavmavnaslatGavoavoavoavoavpavqavoavratGasmazuaoKakGaDqaBxazYaBzaByaCuavzavAazTazTazTavBavCavDayPawkaxmaxmaswavEavFaxeaxbaxfavJavKavLavMaswaBQaAfaBRaAfaxhaAbapcaaaapcaboaaaaaaabeabeabeabeabeabeabeabeabeabeabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaaTauqavQausaacauqavRausaacauqavSausaaaaboaaaaaaaaaaaaaaaaaaaaaapsapsapsapsaaaaacapsapsapsapsasXapsauHauHauHauHaqpamaavXaqZaCjaxCaxCaySamaamaazIatgamaamaamaawdamaamaamaaquauDatAavjaquarCatfauQaxSatfatfaobaxTaxVaxUaxVaxVauOasiawmasjauTauxawpawqawrauTaAnadtaDRadtadtaDPaDRaDQaDTaDSawxawyawzauEawyawAawBawCawDawEawFawGaslawHavqavqawaavkawfaweavoawMawNasmarRaoKakGawgawIawSawTawJawKawWawXawYawZabRabRabRabRayPaxjaxiaxlaswaxaaxkazHaxdaBHaBeaBNaBLaBTaswaBUaxgaBVaBWaFlaAbaaaaaaaacaboaaaaaaaaaaacaaaaaaaacaaaaaaaaaaaaaaaabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaboaaaauqaxnausaaaauqavQausaaaauqavRausaacaacaaaaaaaaaaaaaaaaaaaacapsatpatrapsapsapsapsattavTaCnaxrauHauHaqpauHaxwaKbaxyaxzaxAaxBaxCaxCaxCamaaxDatPaKwaLvaKNaPraKNaPQaPraKNaxLaxMaxNaxcaxPauvatfaxXaxWaxYauSaobazjaAzazkaAzaAAaABaxZayaaqGaybaycaydaycayeauTayfacNauwayhayiayiaykaWuawlawlawlawlawlawlawlaeqaqSaqTatBayqawFayraslaysavqavoavkawLavkavkayuawMayvasmarRaoKakGawQawRaiAayzayAayBayCakiakjayDayEawnayGayHayPayPaFJaDraswaswaswaswaswayLayIaswaswaCwaswaDvaDvaDyaJnaJsaAbayQaaaaacaboabeabeabeabeabeabeabeabeabeabeabeaaaabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaboaaaauqavRausaacauqaxnausaaaauqaxnausaacaaaaaaaaaaaaaaaaaaaaaaacapsauAauUapsauZauXapsaKbaXaaXaaXFaXaaXaaXaaXaavaavbamaaySbtwaqpaySaxCaxCamaaxDazdazeavsazgazgazgazgazgazgazgazhaziaxOaADatfatfaCtatfanZanZaobaobaobaobaobaobaobazlarWazmaznazoazpazqazrauTauTauTazsaztaaUaaUazsbbuawlawwazBawUaynaymawlayoayxaypaslazzawFazAaslayyazCavoavoavqazDavoazEavrazFasmarRazGakGawVaytafMazJazKazLazLazMazNazOazPayFazRazSabRazUazVaDzaDsaEjaEhaIBaEhaGOaIpdDVaSxaLMaSxaSxaLNaMXaMVaFkaDwayQaaaaacaaaaaaaaaaaaaacaaaaaaaacaaaaaaaaaabeaaaabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaboaaaauqaxnausaaaauqavQausaaaauqavRausaacaacaaaaaaaaaaaaaaaaaaaacapsatpatrapsapsapsapsattavTaCnaxrauHauHaqpauHaxwaKbaxyaxzaxAaxBaxCaxCaxCamaaxDatPaKwaLvaKNaPraKNaPQaPraKNaxLaxMaxNaxcaxPauvatfaxXaxWaxYauSaobazjaAzazkaAzaAAaABaxZayaazmaybaycaydaycayeauTayfacNauwayhayiayiaykaWuawlawlawlawlawlawlawlaeqaqSaqTatBayqawFayraslaysavqavoavkawLavkavkayuawMayvasmarRaoKakGawQawRaiAayzayAayBayCakiakjayDayEawnayGayHayPayPaFJaDraswaswaswaswaswayLayIaswaswaCwaswaDvaDvaDyaJnaJsaAbayQaaaaacaboabeabeabeabeabeabeabeabeabeabeabeaaaabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaboaaaauqavRausaacauqaxnausaaaauqaxnausaacaaaaaaaaaaaaaaaaaaaaaaacapsauAauUapsauZauXapsaKbaXaaXaaXFaXaaXaaXaaXaavaavbamaaySbtwaqpaySaxCaxCamaaxDazdazeavsazgazgazgazgazgazgazgazhaziaxOaADatfatfaCtatfanZanZaobaobaobaobaobaobaobazlarWaqGaznazoazpazqazrauTauTauTazsaztaaUaaUazsbbuawlawwazBawUaynaymawlayoayxaypaslazzawFazAaslayyazCavoavoavqazDavoazEavrazFasmarRazGakGawVaytafMazJazKazLazLazMazNazOazPayFazRazSabRazUazVaDzaDsaEjaEhaIBaEhaGOaIpdDVaSxaLMaSxaSxaLNaMXaMVaFkaDwayQaaaaacaaaaaaaaaaaaaacaaaaaaaacaaaaaaaaaabeaaaabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaboaboaAgaacauqavSausaaaauqavRausaaaauqavRausaaaaaaaaaaaaaacaAhaAiaAiaAiaAiapsavuapsavUavvapsbcoaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaRjaqpauHaxtazgaAraAsaAtaAuaAvaAuaAwaAxaAyaGVaNDaCvaEgaFHazxaAFaAGaAHaAIaAIaAJaAKazvaNJaAXaANaAOaAPaAQaARaASaATaAUauTaAVavVauyavWavYbbuawlaZPaACaACaACaACaALaAEaBcaBiaBjaBkaBlaBmaslaBnaBoatGaBpaBqaBraBsaCsazQaBvasmarRaBwaNFaNEaNSabRaBaaBBaBCaBDaBEaBbaBtayEaBdaBIaBJabRaBKaMYaMZaMZaNBaNjaFKaMZaMZaHoaMZaOwaMZaMZaMZaMZaOBdDDaHUaDwayQaaaaacaaaaaaaaaaaaaacaacaaaaacaaaaacaacabeaacabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBXaaaaaaaaaaacaaaaBYaaaaacaaaaBZaaaaacaaaaBZaacaaaaaaaacaCaaCbaCcaCdaCeaCfaCgauHauHapsapsavuapsbcoaAmaaaaacaaaaacaaaaacaaaaCkaaaaacaaaaacaaaaacaaaaAmaCnaCnaCnaxtazgaAraAsaCoaCpaAvaAuaCqaCraDgaOSaOTaEiaElaEXaCyaCyaCyaCyaCzaCAaCBaCCaEUaxZaCEaCFaCGaCHaCIaCJaCKaCLaCMauTaCNaCOaCPawcawuawtaBFaBuaCxaylaylaCDawlaCTaDaaDbaslaslaslaslaslaDcaCUaDeaDfaDfaDfaDfaEvaCVaDiasmaDjaBwaDkaDlaDmabRaBAabRaDoaCWaDoabRavtaOUaOVaCXabRabRaDuaFkaPxaBMaPFaPyayQayQayQayQayQayQaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaJmaaaaaaabeaaaabeabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaaaaDAaDBaDCaDDaDEaDBaDFaDFaDEaDGaDDaDHaDEaDGaDDaDHaDIaDJaDKaDJaDLaDMaDNaDObenbeobeobenbeoberbeqaAmaacaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaAmaacaAmaDUaDVaqpaxtazgaDXaDYaDZaEaaEbaEcaEdaEeaEfaADaPDaFIaFLaBhaFMaEmaEmaEnaEoaEpaEqaEraBfaEtaEuaEPaEwaExaEyawoaEzauTaEAaEAaEBaECaECaECaEDaECawlaCZaylaylaDhaDdawlaBgaEHaEIaEJaELaELaEMaELaELaENaELaEOaEOaEOaEOaFnaEQaERaESaETaCYaEVaEWaEOaEkaBGaEZaEZaFaaFbaFcaFdaFeaFfaFgaFhaFiaFjaFkbexaDwdERaFmaLJaFoaLLaLKaQBaGCaJmaQRaOyaOyaOyaOyaOyaOyaOAaOzaOyaOyaGAaFpaFpaFpaOyaOyaOyaJmaaaaaaabeaaaaaaabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

View File

@@ -5758,7 +5758,7 @@
"cgL" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/obj/machinery/light,/turf/simulated/floor,/area/engineering/atmos)
"cgM" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/machinery/door_control{desc = "A remote control-switch for the engineering security doors."; id_tag = "air_vent"; name = "EMERGENCY VENT"; pixel_x = 0; pixel_y = -30; req_access_txt = "24"},/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/turf/simulated/floor{icon_state = "arrival"; dir = 10},/area/engineering/atmos)
"cgN" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1443; input_tag = "air_in"; name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; sensors = list("air_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/turf/simulated/floor{icon_state = "arrival"},/area/engineering/atmos)
"cgO" = (/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"})
"cgO" = (/obj/structure/stool/bed/chair/vehicle/wheelchair,/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"})
"cgP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/starboard)
"cgQ" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/engineering/atmos)
"cgR" = (/obj/machinery/door/airlock/external{req_access_txt = "24"},/turf/simulated/floor/plating,/area/engineering/atmos)

View File

@@ -196,8 +196,8 @@
"adN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"adO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"adP" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"adQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Medbay North"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"adR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 10; icon_state = "whitehall"},/area/medical/medbay)
"adQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Medbay North"},/obj/structure/stool/bed/chair/vehicle/wheelchair,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"adR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/stool/bed/chair/vehicle/wheelchair,/turf/simulated/floor{dir = 10; icon_state = "whitehall"},/area/medical/medbay)
"adS" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/vending/wallmed1{pixel_x = 28},/turf/simulated/floor{icon_state = "whitehall"},/area/medical/medbay)
"adT" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/wall,/area/medical/medbay2)
"adU" = (/obj/structure/closet/secure_closet/medical3,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 9; icon_state = "whitegreen"},/area/medical/medbay2)

View File

@@ -5039,7 +5039,7 @@
"bSU" = (/obj/machinery/iv_drip,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/storage)
"bSV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/storage)
"bSW" = (/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bSX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bSX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/obj/structure/stool/bed/chair/vehicle/wheelchair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bSY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "oncpriv"; name = "Privacy Shutters"; opacity = 0},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/cmo)
"bSZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
"bTa" = (/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
@@ -5118,7 +5118,7 @@
"bUv" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/obj/machinery/door/airlock/research{name = "Toxins Storage"; req_access_txt = "8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/science/storage)
"bUw" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bUx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bUy" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bUy" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/stool/bed/chair/vehicle/wheelchair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
"bUz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "oncpriv"; name = "Privacy Shutters"; opacity = 0},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/medical/cmo)
"bUA" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/cartridge/medical{pixel_x = 3; pixel_y = 4},/obj/item/weapon/cartridge/medical{pixel_y = -4},/obj/item/weapon/cartridge/medical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/cartridge/chemistry{pixel_x = 3; pixel_y = -3},/obj/item/weapon/pen,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
"bUB" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/hud/health,/obj/item/weapon/stamp/cmo,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)

View File

@@ -811,7 +811,8 @@
#include "code\game\objects\structures\vehicles\adminbus_powers.dm"
#include "code\game\objects\structures\vehicles\clowncart.dm"
#include "code\game\objects\structures\vehicles\gokart.dm"
#include "code\game\objects\structures\vehicles\vehicle.dm"
#include "code\game\objects\structures\vehicles\vehicle.dm"
#include "code\game\objects\structures\vehicles\wheelchair.dm"
#include "code\game\objects\structures\vehicles\wizmobile.dm"
#include "code\game\turfs\simulated.dm"
#include "code\game\turfs\turf.dm"
@@ -1740,4 +1741,4 @@
#include "maps\RandomZLevels\challenge.dm"
#include "maps\RandomZLevels\stationCollision.dm"
#include "maps\RandomZLevels\wildwest.dm"
// END_INCLUDE
// END_INCLUDE