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

fix

Browse Source
This commit is contained in:
unid15
2015-08-28 21:32:55 +02:00
parent 9fc6e79859
commit dee2e2f088
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_animal/hostile/carp.dm
View File

@@ -75,7 +75,7 @@
if(ismob(A) && A.reagents)
if(pheromones_act == PHEROMONES_NEUTRAL && A.reagents.has_reagent("carppheromones"))
return 1 //Carps who avoid pheromones don't target mobs with pheromones in their system. They just ignore them!
..()
return ..(A)
/mob/living/simple_animal/hostile/carp/FindTarget()
. = ..()

2
maps/metaclub.dmm
View File

@@ -1513,7 +1513,7 @@
"aDe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/maintenance/ghettobar)
"aDf" = (/obj/item/weapon/dice/d20,/obj/item/weapon/dice,/obj/structure/table/woodentable,/obj/machinery/light_construct/small,/turf/simulated/floor/wood,/area/maintenance/ghettobar)
"aDg" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/mining/station)
"aDh" = (/obj/machinery/door/unpowered/shuttle{name = "Mining Shuttle Airlock"; req_access_txt = "0"},/turf/simulated/shuttle/floor,/area/shuttle/mining/station)
"aDh" = (/obj/machinery/door/unpowered/shuttle{name = "Mining Shuttle Airlock"; req_access_txt = "0"},/obj/structure/docking_port/shuttle{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/mining/station)
"aDi" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"},/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/shuttle/escape_pod2/station)
"aDj" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Dock"; req_access_txt = "0"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/turf/simulated/floor,/area/supply/miningdock{name = "\improper Mining Office"})
"aDk" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/supply/miningdock{name = "\improper Mining Office"})

5
maps/taxistation.dmm
View File

@@ -6805,7 +6805,7 @@
"cAS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
"cAT" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
"cAU" = (/obj/item/weapon/stool,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
"cAV" = (/obj/machinery/door/airlock/external{name = "Mining Station Dock Airlock"; req_access_txt = "54"},/turf/simulated/floor/plating,/area/mine/eva{name = "Outpost Mining Dock"})
"cAV" = (/obj/machinery/door/airlock/external{name = "Mining Station Dock Airlock"; req_access_txt = "54"},/obj/structure/docking_port/destination/research/outpost{dir = 8},/turf/simulated/floor/plating,/area/mine/eva{name = "Outpost Mining Dock"})
"cAW" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/spectro)
"cAX" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/folder,/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro)
"cAY" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/full/reinforced,/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/spectro)
@@ -7317,7 +7317,6 @@
"cKK" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/carpet,/area/shuttle/salvage/start)
"cKL" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/vox_trading_post/trading_floor)
"cKM" = (/obj/structure/docking_port/destination/syndicate/mining,/turf/space,/area)
"cKN" = (/obj/structure/docking_port/destination/research/outpost{dir = 4},/turf/simulated/wall,/area/research_outpost/entry{name = "Outpost Research Dock"})
"cKO" = (/obj/structure/docking_port/destination/vox/mining,/turf/space,/area)
"cKP" = (/obj/structure/bed/chair,/turf/simulated/floor{icon_state = "dark"},/area/vox_trading_post/trading_floor)
"cKR" = (/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
@@ -8800,7 +8799,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxabxabxabxabxab
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaaaaaaabxaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaQIaaaaaaaaaaaacuHcuHcuIcuHcujculcymculcujcuKcuLcEtculaaaaaaaaaaaacuncGNcuOcuPcumcuncAFcuncumcuCcuDcumaaaaaaaQIaPvaPvaPvaPvaPvaPvaPvaQIaRaaRaaQIaPvaPvaPvaPvaPuaPuaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaQIaRaaQIaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaaaaaaabxaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaaaaaaaaaaaaaaaaaacuHcIecuScuTcujcuUcuVcuWcuXcuYcuZcuVcCiaaaaaaaaaaaacAVcuFcvccuFcvdcvecuFcvfcvdcuFcvgcumaaaaaaaQIaPvaPvaPvaPvaPvaPvaPvaQIaRaaRaaQIaPvaPvaPvaPvaPvaPuaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaQIaRaaQIaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaQIaaaaaaaaaaaaaaaaaacuHcJFcvicvjcujcvkcvlcvmcvncvmcvocuVculaaaaaaaaaaaacuncuFcvpcvqcvrcvqcvscuFcvtcvucvvcumaaaaaaaRaaQIaPvaPvaPvaPvaPvaPvaQIaRaaRaaQIaPvaPvaPvaPvaPvaPuaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaQIaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaRaaRaaaaaaaaaaaaaaaaaaacuHcvwcvxcvycujcvzcvAcuVcuXcEWcvCcvDcKNaaaaaaaaaaaacumcvEcvFcvGcvdcvHcvIcvJcumcvKcvLcumaaaaRaaRaaQIaPvaPvaPvaPvaPvaPvaQIaRaaRaaRaaQIaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaRaaRaaaaaaaaaaaaaaaaaaacuHcvwcvxcvycujcvzcvAcuVcuXcEWcvCcvDcujaaaaaaaaaaaacumcvEcvFcvGcvdcvHcvIcvJcumcvKcvLcumaaaaRaaRaaQIaPvaPvaPvaPvaPvaPvaQIaRaaRaaRaaQIaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxabxabxaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaQIaRaaRaaRaaaaaaaaaaaaaaaacuHcuHcvMcuHcvNcujcujcujcujcujcujcEXcuXcujaaaaaaaaaaaacumcvdcEYcumcumcumcumcumcumcumcumcumaaaaRaaaaaQIaPvaPvaPvaPvaPvaPvaPvaQIaRaaRaaQIaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaQIaRaaRaaRaaRaaRaaRaaaaaaaaaaaaacuHcvQcvRcuHcvScvTcvUcvVcvWcvXcEZcvYcvZcwacwbcwacwacwbcwacwccvYcvWcvXcvWcwdcwecwfcqAcqncwiaaaaaaaaaaaaaQIaPvaPvaPvaPvaPvaPvaQIaRaaRaaQIaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaRaaRaaRaaRaaRaaaaaaaaaaaaacuHcwjcwkcuHcwlcFacwncwocwpcwqcwrcwscwtcwucwrcwvcwwcwrcwucwxcwycwpcwzcwpcwAcwBcwCcwDcqncwEaaaaaaaaaaaaaQIaPvaPvaPvaPvaPvaPvaQIaRaaRaaQIaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaPvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa