cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed Magic Missiles cooldown to 15 seconds.

Browse Source 
Made the range on Artificer 0 so the shell will spawn under the user.

Wraiths can now see in the dark.

Moved the emergency storage near arrivals to replace chem storage, put an art supply storage where the emergency storage used to be.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3332 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
kortgstation@gmail.com
2012-03-20 22:54:30 +00:00
parent 8fe80454fd
commit 03158b34e3
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/spells/wizard.dm
View File

@@ -3,7 +3,7 @@
desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
school = "evocation"
charge_max = 100
charge_max = 150
clothes_req = 1
invocation = "FORTI GY AMA"
invocation_type = "shout"
@@ -158,7 +158,7 @@
clothes_req = 0
invocation = "none"
invocation_type = "none"
range = 1
range = 0
summon_type = list("/obj/structure/constructshell")

4
code/defines/area/Space Station 13 areas.dm
View File

@@ -995,6 +995,10 @@ proc/process_ghost_teleport_locs()
name = "Autolathe Storage"
icon_state = "storage"
/area/storage/art
name = "Art Supply Storage"
icon_state = "storage"
/area/storage/auxillary
name = "Auxillary Storage"
icon_state = "auxstorage"

2
code/modules/mob/simple_animal/constructs.dm
View File

@@ -32,6 +32,7 @@
canstun = 0
canweaken = 0
Life()
..()
if(stat == 2)
@@ -161,6 +162,7 @@
stop_automated_movement = 1
canstun = 0
canweaken = 0
see_in_dark = 7
Life()
..()

46
maps/tgstation.2.0.8.dmm
View File

@@ -1793,9 +1793,9 @@
"aIy" = (/turf/simulated/wall,/area/crew_quarters/locker)
"aIz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/northleft{dir = 2; icon_state = "left"; req_access_txt = "0"},/turf/simulated/floor,/area/crew_quarters/locker)
"aIA" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/northleft{base_state = "right"; dir = 2; icon_state = "right"},/turf/simulated/floor,/area/crew_quarters/locker)
"aIB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/storage/emergency)
"aIC" = (/turf/simulated/wall,/area/storage/emergency)
"aID" = (/obj/machinery/door/airlock/maintenance{name = "Emergency Storage"},/turf/simulated/floor/plating,/area/storage/emergency)
"aIB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/storage/art)
"aIC" = (/turf/simulated/wall,/area/storage/art)
"aID" = (/obj/machinery/door/airlock/glass{name = "Art Storage"},/turf/simulated/floor/plating,/area/storage/art)
"aIE" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/primary/port)
"aIF" = (/obj/structure/table,/turf/simulated/floor,/area/hallway/primary/port)
"aIG" = (/obj/machinery/camera{c_tag = "Port Hallway"; dir = 1},/obj/structure/table,/turf/simulated/floor,/area/hallway/primary/port)
@@ -1870,10 +1870,10 @@
"aJX" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/crew_quarters/locker)
"aJY" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/crew_quarters/locker)
"aJZ" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor,/area/crew_quarters/locker)
"aKa" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/storage/emergency)
"aKb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/storage/emergency)
"aKc" = (/turf/simulated/floor/plating,/area/storage/emergency)
"aKd" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plating,/area/storage/emergency)
"aKa" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/storage/art)
"aKb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil/blue,/obj/item/weapon/cable_coil/green,/obj/item/weapon/cable_coil/yellow,/turf/simulated/floor,/area/storage/art)
"aKc" = (/turf/simulated/floor,/area/storage/art)
"aKd" = (/obj/structure/table,/obj/item/weapon/paint/anycolor,/obj/item/weapon/paint/anycolor,/turf/simulated/floor,/area/storage/art)
"aKe" = (/turf/simulated/wall,/area/storage/tools)
"aKf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/tools)
"aKg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Tool Storage"; req_access_txt = "12"},/turf/simulated/floor,/area/storage/tools)
@@ -1930,14 +1930,14 @@
"aLf" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/closet/wardrobe/mixed,/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor,/area/crew_quarters/locker)
"aLg" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor,/area/crew_quarters/locker)
"aLh" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/locker)
"aLi" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/storage/emergency)
"aLj" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/storage/emergency)
"aLk" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Emergency Storage APC"; pixel_x = 27; pixel_y = 2},/turf/simulated/floor/plating,/area/storage/emergency)
"aLi" = (/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil/blue,/obj/item/weapon/cable_coil/green,/obj/item/weapon/cable_coil/yellow,/turf/simulated/floor,/area/storage/art)
"aLj" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/storage/art)
"aLk" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Art Storage APC"; pixel_x = 27; pixel_y = 2},/obj/structure/table,/obj/item/weapon/paint/anycolor,/obj/item/weapon/paint/anycolor,/turf/simulated/floor,/area/storage/art)
"aLl" = (/obj/effect/landmark{name = "blobstart"},/obj/item/clothing/suit/ianshirt,/turf/simulated/floor/plating,/area/maintenance/port)
"aLm" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port)
"aLn" = (/turf/simulated/wall/r_wall,/area/storage/tools)
"aLo" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aLp" = (/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aLo" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/storage/tools)
"aLp" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plating,/area/storage/tools)
"aLq" = (/obj/machinery/power/apc{dir = 1; name = "Tool Storage APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/storage/tools)
"aLr" = (/turf/simulated/floor,/area/storage/tools)
"aLs" = (/obj/structure/table,/obj/machinery/light/small{dir = 1},/obj/item/weapon/module/power_control,/turf/simulated/floor,/area/storage/tools)
@@ -1995,12 +1995,12 @@
"aMs" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor,/area/crew_quarters/locker)
"aMt" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/locker)
"aMu" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/locker)
"aMv" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plating,/area/storage/emergency)
"aMw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/storage/emergency)
"aMx" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating,/area/storage/emergency)
"aMv" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil/blue,/obj/item/weapon/cable_coil/green,/obj/item/weapon/cable_coil/yellow,/turf/simulated/floor,/area/storage/art)
"aMw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/light/small,/obj/structure/table,/obj/item/weapon/storage/crayonbox,/obj/item/weapon/storage/crayonbox,/obj/item/weapon/storage/crayonbox,/turf/simulated/floor,/area/storage/art)
"aMx" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/weapon/paint/paint_remover,/obj/item/weapon/paint/paint_remover,/turf/simulated/floor,/area/storage/art)
"aMy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"aMz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aMA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aMz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/storage/tools)
"aMA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating,/area/storage/tools)
"aMB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/storage/tools)
"aMC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/tools)
"aMD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tools)
@@ -2067,12 +2067,12 @@
"aNM" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/port)
"aNN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/locker)
"aNO" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor,/area/crew_quarters/locker)
"aNP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/wall,/area/storage/emergency)
"aNQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/storage/emergency)
"aNP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/wall,/area/storage/art)
"aNQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/storage/art)
"aNR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/port)
"aNS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Chemical Storage Maintenance"; req_access_txt = "12;33"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tools)
"aNT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aNU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aNT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/storage/tools)
"aNU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/storage/tools)
"aNV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/wall,/area/storage/tools)
"aNW" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/storage/tools)
"aNX" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/hallway/primary/central)
@@ -2145,8 +2145,8 @@
"aPm" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/port)
"aPn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"aPo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/camera{c_tag = "Port Maintenance 2"; dir = 8; network = "SS13"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/port)
"aPp" = (/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aPq" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/closet/secure_closet/medical2{pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/storage/tools)
"aPp" = (/turf/simulated/floor/plating,/area/storage/tools)
"aPq" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/storage/tools)
"aPr" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/camera{c_tag = "Engineering South-West"; dir = 1},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/storage/tools)
"aPs" = (/obj/structure/table,/turf/simulated/floor,/area/storage/tools)
"aPt" = (/obj/structure/reagent_dispensers/fueltank,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/storage/tools)