shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It's been a long night

Browse Source
This commit is contained in:
LetterJay
2017-05-30 22:41:22 -05:00
parent 9ba058930e
commit 9b00499d24
17 changed files with 225123 additions and 35253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Cerestation/cerestation.dmm
+6 -6
View File
@@ -2353,7 +2353,7 @@
/obj/structure/window/reinforced{
dir = 1
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/syndicate)
"aeX" = (
/obj/structure/reagent_dispensers/fueltank,
@@ -2590,17 +2590,17 @@
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l"
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/syndicate)
"afu" = (
/obj/structure/shuttle/engine/propulsion,
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/syndicate)
"afv" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r"
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/syndicate)
"afw" = (
/obj/structure/closet,
@@ -101529,7 +101529,7 @@ cpo
cqk
cri
cqk
dky
dkx
ctm
cua
cKv
@@ -101786,7 +101786,7 @@ cpo
cql
crj
csf
dkz
dkx
ctn
cub
cuu
_maps/map_files/Deltastation/DeltaStation2.dmm
+7996 -14842
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+7618 -8748
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/OmegaStation.dmm
+1090 -2026
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+2614 -4394
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+7696 -4224
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/debug/runtimestation.dmm
+1417 -201
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/Centcomm.dmm
+50 -29
View File
@@ -2648,7 +2648,7 @@
/turf/open/floor/circuit,
/area/ctf)
"hq" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"hr" = (
/obj/effect/turf_decal/stripes/line,
@@ -3700,7 +3700,7 @@
turf_type = /turf/open/floor/plating/asteroid/snow;
width = 50
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"jY" = (
/turf/open/floor/plasteel/brown{
@@ -4260,7 +4260,7 @@
/area/centcom/control)
"ln" = (
/obj/structure/flora/grass/both,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lo" = (
/obj/structure/table/reinforced,
@@ -4415,11 +4415,11 @@
/area/centcom/control)
"lF" = (
/obj/structure/flora/grass/brown,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lG" = (
/obj/structure/flora/tree/pine,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lH" = (
/turf/closed/indestructible/fakeglass{
@@ -4433,7 +4433,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lJ" = (
/turf/closed/indestructible/riveted,
@@ -4636,7 +4636,7 @@
/area/syndicate_mothership/control)
"mh" = (
/obj/item/toy/figure/syndie,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"mi" = (
/obj/machinery/newscaster/security_unit,
@@ -4769,7 +4769,7 @@
/area/centcom/control)
"mz" = (
/obj/structure/flora/bush,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"mA" = (
/turf/closed/indestructible/fakeglass,
@@ -5976,7 +5976,7 @@
},
/area/wizard_station)
"pk" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/space)
"pl" = (
/obj/machinery/computer/shuttle/syndicate/recall,
@@ -6941,7 +6941,7 @@
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
"rl" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
dir = 8;
@@ -6960,7 +6960,7 @@
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"ro" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
dir = 1;
@@ -7776,7 +7776,7 @@
turf_type = /turf/open/floor/plating/asteroid/snow;
width = 18
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/space)
"th" = (
/obj/item/weapon/storage/box/drinkingglasses,
@@ -8097,7 +8097,7 @@
name = "\improper FOURTH WALL";
pixel_x = -32
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"tS" = (
/turf/open/floor/wood,
@@ -8332,14 +8332,14 @@
},
/area/syndicate_mothership/control)
"ux" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
icon_state = "diagonalWall3"
},
/area/shuttle/assault_pod)
"uy" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
dir = 4;
@@ -9745,7 +9745,7 @@
/area/centcom/evac)
"yc" = (
/obj/structure/statue/uranium/nuke,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"yd" = (
/obj/structure/table/wood,
@@ -12212,7 +12212,7 @@
name = "Thunderdome Blast Door"
},
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena)
@@ -12243,7 +12243,7 @@
name = "General Supply"
},
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena)
@@ -12394,7 +12394,7 @@
/area/tdome/arena)
"Ey" = (
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena)
@@ -13716,7 +13716,7 @@
/area/tdome/arena_source)
"IS" = (
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena_source)
@@ -13765,7 +13765,7 @@
/area/tdome/arena_source)
"Jd" = (
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena_source)
@@ -14078,7 +14078,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Kh" = (
/obj/machinery/light{
@@ -14104,7 +14104,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Kk" = (
/obj/structure/chair{
@@ -14123,7 +14123,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Km" = (
/obj/effect/turf_decal/stripes/line,
@@ -14141,7 +14141,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Kp" = (
/obj/structure/flora/ausbushes/lavendergrass,
@@ -14657,7 +14657,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Lx" = (
/obj/structure/flora/grass/brown,
@@ -14665,7 +14665,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Ly" = (
/obj/structure/flora/grass/brown,
@@ -14897,6 +14897,27 @@
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"Mg" = (
/obj/item/cardboard_cutout{
desc = "They seem to be ignoring you... Typical.";
dir = 1;
icon_state = "cutout_ntsec";
name = "Private Security Officer"
},
/turf/open/floor/plasteel/darkred/side{
dir = 1
},
/area/centcom/evac)
"Mh" = (
/obj/item/cardboard_cutout{
desc = "They seem to be ignoring you... Typical.";
icon_state = "cutout_ntsec";
name = "Private Security Officer"
},
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/centcom/evac)
(1,1,1) = {"
aa
@@ -65195,7 +65216,7 @@ sv
wW
xt
xQ
xZ
Mg
yC
yC
yU
@@ -65454,7 +65475,7 @@ xp
xR
xZ
yC
yC
Mh
yV
qk
aa
_maps/map_files/generic/Space.dmm
+65537 -256
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/SpaceDock.dmm
+65549 -257
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/SpaceStation.dmm
+65537 -256
View File
File diff suppressed because it is too large Load Diff
code/controllers/subsystem/events.dm
+1 -1
View File
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(events)
//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
var/list/danger_areas = list(
/area/engine/break_room,
/area/engine/chiefs_office)
/area/crew_quarters/heads/chief)
//Need to locate() as it's just a list of paths.
return locate(pick((GLOB.the_station_areas - safe_areas) + danger_areas))
code/datums/weather/weather_types.dm
+1 -1
View File
@@ -134,7 +134,7 @@
area_type = /area
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/shuttle)
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle)
target_z = ZLEVEL_STATION
immunity_type = "rad"
code/game/turfs/simulated/dirtystation.dm
+7 -7
View File
@@ -25,14 +25,14 @@
//The code below here isn't exactly optimal, but because of the individual decals that each area uses it's still applicable.
//high dirt - 1/3
if(istype(A, /area/toxins/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
if(istype(A, /area/science/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works
return
if(prob(80)) //mid dirt - 1/15
return
if(istype(A, /area/engine) || istype(A,/area/assembly) || istype(A,/area/maintenance) || istype(A,/area/construction))
if(istype(A, /area/engine) || istype(A, /area/crew_quarters/heads/chief) || istype(A,/area/assembly) || istype(A, /area/science/robotics) || istype(A,/area/maintenance) || istype(A,/area/construction))
//Blood, sweat, and oil. Oh, and dirt.
if(prob(3))
new /obj/effect/decal/cleanable/blood/old(src)
@@ -46,7 +46,7 @@
new /obj/effect/decal/cleanable/dirt(src)
return
if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/locker/locker_toilet))
if(istype(A, /area/crew_quarters/toilet))
if(prob(40))
if(prob(90))
new /obj/effect/decal/cleanable/vomit/old(src)
@@ -62,7 +62,7 @@
if(prob(75)) //low dirt - 1/60
return
if(istype(A, /area/ai_monitored/turret_protected) || istype(A, /area/security)) //chance of incident
if(istype(A, /area/ai_monitored/turret_protected) || istype(A, /area/prison) || istype(A, /area/security) || istype(A, /area/crew_quarters/heads/hos)) //chance of incident
if(prob(20))
if(prob(5))
new /obj/effect/decal/cleanable/blood/gibs/old(src)
@@ -71,7 +71,7 @@
return
if(istype(A, /area/crew_quarters/kitchen)) //Kitchen messes
if(istype(A, /area/crew_quarters/kitchen) || istype(A, /area/crew_quarters/cafeteria)) //Kitchen messes
if(prob(60))
if(prob(50))
new /obj/effect/decal/cleanable/egg_smudge(src)
@@ -79,7 +79,7 @@
new /obj/effect/decal/cleanable/flour(src)
return
if(istype(A, /area/medical)) //Kept clean, but chance of blood
if(istype(A, /area/medical) || istype(A, /area/crew_quarters/heads/cmo)) //Kept clean, but chance of blood
if(prob(66))
if(prob(5))
new /obj/effect/decal/cleanable/blood/gibs/old(src)
@@ -92,7 +92,7 @@
new /obj/effect/decal/cleanable/vomit/old(src)
return
if(istype(A, /area/toxins))
if(istype(A, /area/science) || istype(A, /area/crew_quarters/heads/hor))
if(prob(20))
new /obj/effect/decal/cleanable/greenglow(src) //this cleans itself up but it might startle you when you see it.
return
code/modules/events/prison_break.dm
+2 -3
View File
@@ -8,13 +8,12 @@
announceWhen = 50
endWhen = 20
var/list/area/areasToOpen = list()
var/list/potential_areas = list(/area/atmos,
/area/bridge,
var/list/potential_areas = list(/area/bridge,
/area/engine,
/area/medical,
/area/security,
/area/quartermaster,
/area/toxins)
/area/science)
var/severity = 1
code/modules/mob/living/carbon/human/interactive.dm
+1 -1
View File
@@ -809,7 +809,7 @@
if(T.title == "Chief Medical Officer" || T.title == "Medical Doctor" || T.title == "Chemist" || T.title == "Virologist" || T.title == "Geneticist")
return /area/medical
if(T.title == "Research Director" || T.title == "Scientist" || T.title == "Roboticist")
return /area/toxins
return /area/science
if(T.title == "Head of Security" || T.title == "Warden" || T.title == "Security Officer" || T.title == "Detective")
return /area/security
if(T.title == "Botanist")
code/modules/research/xenobiology/xenobio_camera.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/mob/camera/aiEye/remote/xenobio/setLoc(var/t)
var/area/new_area = get_area(t)
if(new_area && new_area.name == allowed_area || istype(new_area, /area/toxins/xenobiology ))
if(new_area && new_area.name == allowed_area || istype(new_area, /area/science/xenobiology ))
return ..()
else
return