mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
MoL - Lag Issue Fixes (#7187)
This commit is contained in:
@@ -166,11 +166,11 @@
|
|||||||
/turf/simulated/floor/wood/sif,
|
/turf/simulated/floor/wood/sif,
|
||||||
/area/awaymission/mol/dorms)
|
/area/awaymission/mol/dorms)
|
||||||
"bg" = (
|
"bg" = (
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
|
||||||
/obj/structure/disposalpipe/segment{
|
/obj/structure/disposalpipe/segment{
|
||||||
dir = 4
|
dir = 4
|
||||||
},
|
},
|
||||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||||
|
/mob/living/simple_mob/vore/candy/peppermint,
|
||||||
/turf/simulated/floor/tiled/kafel_full/white,
|
/turf/simulated/floor/tiled/kafel_full/white,
|
||||||
/area/awaymission/mol/kitchen)
|
/area/awaymission/mol/kitchen)
|
||||||
"bh" = (
|
"bh" = (
|
||||||
@@ -311,6 +311,9 @@
|
|||||||
},
|
},
|
||||||
/area/awaymission/mol/mines)
|
/area/awaymission/mol/mines)
|
||||||
"cj" = (
|
"cj" = (
|
||||||
|
/obj/machinery/door/blast/puzzle{
|
||||||
|
id = "FinaleGate2"
|
||||||
|
},
|
||||||
/turf/simulated/floor/carpet/blue,
|
/turf/simulated/floor/carpet/blue,
|
||||||
/area/awaymission/mol/kitchen)
|
/area/awaymission/mol/kitchen)
|
||||||
"ck" = (
|
"ck" = (
|
||||||
@@ -1369,12 +1372,6 @@
|
|||||||
/obj/item/weapon/storage/firstaid/clotting,
|
/obj/item/weapon/storage/firstaid/clotting,
|
||||||
/turf/simulated/floor/tiled/red,
|
/turf/simulated/floor/tiled/red,
|
||||||
/area/awaymission/mol/security)
|
/area/awaymission/mol/security)
|
||||||
"jV" = (
|
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
|
||||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
|
||||||
/obj/effect/floor_decal/industrial/warning,
|
|
||||||
/turf/simulated/floor/tiled/kafel_full/white,
|
|
||||||
/area/awaymission/mol/kitchen)
|
|
||||||
"jW" = (
|
"jW" = (
|
||||||
/obj/structure/table/marble,
|
/obj/structure/table/marble,
|
||||||
/obj/random/meat,
|
/obj/random/meat,
|
||||||
@@ -2929,14 +2926,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/tiled/kafel_full/purple,
|
/turf/simulated/floor/tiled/kafel_full/purple,
|
||||||
/area/awaymission/mol/kitchen/chamberC)
|
/area/awaymission/mol/kitchen/chamberC)
|
||||||
"uF" = (
|
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
|
||||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
|
||||||
/obj/effect/floor_decal/industrial/warning{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/tiled/kafel_full/white,
|
|
||||||
/area/awaymission/mol/kitchen)
|
|
||||||
"uH" = (
|
"uH" = (
|
||||||
/mob/living/simple_mob/vore/candy/peppermint,
|
/mob/living/simple_mob/vore/candy/peppermint,
|
||||||
/turf/simulated/floor/tiled/kafel_full/purple,
|
/turf/simulated/floor/tiled/kafel_full/purple,
|
||||||
@@ -3015,13 +3004,6 @@
|
|||||||
/mob/living/simple_mob/vore/candy/marshmellowserpent,
|
/mob/living/simple_mob/vore/candy/marshmellowserpent,
|
||||||
/turf/simulated/floor/tiled/kafel_full/blue,
|
/turf/simulated/floor/tiled/kafel_full/blue,
|
||||||
/area/awaymission/mol/kitchen/chamberB)
|
/area/awaymission/mol/kitchen/chamberB)
|
||||||
"vk" = (
|
|
||||||
/obj/machinery/conveyor{
|
|
||||||
dir = 4;
|
|
||||||
id = "Candy Zone"
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/bmarble,
|
|
||||||
/area/awaymission/mol/entrancetunnel)
|
|
||||||
"vr" = (
|
"vr" = (
|
||||||
/obj/machinery/light{
|
/obj/machinery/light{
|
||||||
dir = 4
|
dir = 4
|
||||||
@@ -3399,10 +3381,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor,
|
/turf/simulated/floor,
|
||||||
/area/awaymission/mol/headdorms)
|
/area/awaymission/mol/headdorms)
|
||||||
"xU" = (
|
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
|
||||||
/turf/simulated/floor/tiled/kafel_full/yellow,
|
|
||||||
/area/awaymission/mol/kitchen/chamberC)
|
|
||||||
"xX" = (
|
"xX" = (
|
||||||
/obj/structure/table/hardwoodtable,
|
/obj/structure/table/hardwoodtable,
|
||||||
/obj/random/maintenance/foodstuff,
|
/obj/random/maintenance/foodstuff,
|
||||||
@@ -4567,13 +4545,6 @@
|
|||||||
/obj/effect/floor_decal/corner/black/diagonal,
|
/obj/effect/floor_decal/corner/black/diagonal,
|
||||||
/turf/simulated/floor/bmarble,
|
/turf/simulated/floor/bmarble,
|
||||||
/area/awaymission/mol/mines)
|
/area/awaymission/mol/mines)
|
||||||
"FK" = (
|
|
||||||
/obj/machinery/conveyor{
|
|
||||||
dir = 1;
|
|
||||||
id = "Candy Zone"
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/bmarble,
|
|
||||||
/area/awaymission/mol/entrancetunnel)
|
|
||||||
"FQ" = (
|
"FQ" = (
|
||||||
/obj/machinery/light,
|
/obj/machinery/light,
|
||||||
/obj/item/weapon/beartrap/hunting{
|
/obj/item/weapon/beartrap/hunting{
|
||||||
@@ -4932,10 +4903,6 @@
|
|||||||
"If" = (
|
"If" = (
|
||||||
/turf/simulated/floor/bmarble,
|
/turf/simulated/floor/bmarble,
|
||||||
/area/awaymission/mol/hardlightentrance)
|
/area/awaymission/mol/hardlightentrance)
|
||||||
"Ih" = (
|
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
|
||||||
/turf/simulated/floor/tiled/kafel_full/purple,
|
|
||||||
/area/awaymission/mol/kitchen/chamberC)
|
|
||||||
"Ii" = (
|
"Ii" = (
|
||||||
/obj/machinery/light{
|
/obj/machinery/light{
|
||||||
dir = 4
|
dir = 4
|
||||||
@@ -5443,11 +5410,6 @@
|
|||||||
/obj/effect/floor_decal/corner/orange/diagonal,
|
/obj/effect/floor_decal/corner/orange/diagonal,
|
||||||
/turf/simulated/floor/tiled/red,
|
/turf/simulated/floor/tiled/red,
|
||||||
/area/awaymission/mol/security)
|
/area/awaymission/mol/security)
|
||||||
"LZ" = (
|
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
|
||||||
/obj/structure/loot_pile/surface/bones,
|
|
||||||
/turf/simulated/floor/tiled/kafel_full/yellow,
|
|
||||||
/area/awaymission/mol/kitchen/chamberC)
|
|
||||||
"Mc" = (
|
"Mc" = (
|
||||||
/turf/simulated/floor/tiled/kafel_full/beige,
|
/turf/simulated/floor/tiled/kafel_full/beige,
|
||||||
/area/awaymission/mol/kitchen/chamberA)
|
/area/awaymission/mol/kitchen/chamberA)
|
||||||
@@ -5460,10 +5422,10 @@
|
|||||||
/turf/simulated/floor/tiled/kafel_full/white,
|
/turf/simulated/floor/tiled/kafel_full/white,
|
||||||
/area/awaymission/mol/kitchen)
|
/area/awaymission/mol/kitchen)
|
||||||
"Me" = (
|
"Me" = (
|
||||||
/mob/living/simple_mob/vore/candy/worm,
|
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||||
/obj/effect/floor_decal/corner/white/diagonal,
|
/mob/living/simple_mob/vore/candy/peppermint,
|
||||||
/turf/simulated/floor/tiled/kafel_full/white,
|
/turf/simulated/floor/tiled/kafel_full/white,
|
||||||
/area/awaymission/mol/kitchen/ChamberD)
|
/area/awaymission/mol/kitchen)
|
||||||
"Mf" = (
|
"Mf" = (
|
||||||
/obj/structure/disposalpipe/segment,
|
/obj/structure/disposalpipe/segment,
|
||||||
/obj/structure/loot_pile/surface/bones,
|
/obj/structure/loot_pile/surface/bones,
|
||||||
@@ -6381,13 +6343,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/bmarble,
|
/turf/simulated/floor/bmarble,
|
||||||
/area/awaymission/mol/vistortunnel)
|
/area/awaymission/mol/vistortunnel)
|
||||||
"SX" = (
|
|
||||||
/obj/machinery/conveyor{
|
|
||||||
id = "Candy Zone";
|
|
||||||
dir = 8
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/bmarble,
|
|
||||||
/area/awaymission/mol/entrancetunnel)
|
|
||||||
"Ta" = (
|
"Ta" = (
|
||||||
/obj/structure/disposalpipe/segment{
|
/obj/structure/disposalpipe/segment{
|
||||||
dir = 4
|
dir = 4
|
||||||
@@ -7127,12 +7082,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/wmarble,
|
/turf/simulated/floor/wmarble,
|
||||||
/area/awaymission/mol/vistortunnel)
|
/area/awaymission/mol/vistortunnel)
|
||||||
"Xz" = (
|
|
||||||
/obj/machinery/conveyor{
|
|
||||||
id = "Candy Zone"
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/bmarble,
|
|
||||||
/area/awaymission/mol/entrancetunnel)
|
|
||||||
"XC" = (
|
"XC" = (
|
||||||
/obj/effect/floor_decal/corner/yellow/border{
|
/obj/effect/floor_decal/corner/yellow/border{
|
||||||
dir = 1
|
dir = 1
|
||||||
@@ -43181,8 +43130,8 @@ rt
|
|||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
SX
|
rt
|
||||||
vk
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
@@ -43439,8 +43388,8 @@ ZY
|
|||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
FK
|
rt
|
||||||
Xz
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
@@ -48096,7 +48045,7 @@ CF
|
|||||||
CF
|
CF
|
||||||
CF
|
CF
|
||||||
CF
|
CF
|
||||||
bg
|
CL
|
||||||
jI
|
jI
|
||||||
QS
|
QS
|
||||||
is
|
is
|
||||||
@@ -57126,7 +57075,7 @@ zC
|
|||||||
Cx
|
Cx
|
||||||
RH
|
RH
|
||||||
lf
|
lf
|
||||||
CL
|
bg
|
||||||
jI
|
jI
|
||||||
QS
|
QS
|
||||||
is
|
is
|
||||||
@@ -58415,9 +58364,9 @@ gn
|
|||||||
gn
|
gn
|
||||||
IZ
|
IZ
|
||||||
RH
|
RH
|
||||||
uF
|
lf
|
||||||
CL
|
CL
|
||||||
jV
|
jI
|
||||||
QS
|
QS
|
||||||
is
|
is
|
||||||
BA
|
BA
|
||||||
@@ -59686,9 +59635,9 @@ TE
|
|||||||
TE
|
TE
|
||||||
is
|
is
|
||||||
qO
|
qO
|
||||||
uF
|
lf
|
||||||
CL
|
CL
|
||||||
jV
|
jI
|
||||||
ni
|
ni
|
||||||
is
|
is
|
||||||
is
|
is
|
||||||
@@ -59953,7 +59902,7 @@ zC
|
|||||||
zC
|
zC
|
||||||
Qd
|
Qd
|
||||||
uD
|
uD
|
||||||
Ih
|
zC
|
||||||
zC
|
zC
|
||||||
zC
|
zC
|
||||||
Ij
|
Ij
|
||||||
@@ -61510,7 +61459,7 @@ zC
|
|||||||
zC
|
zC
|
||||||
zC
|
zC
|
||||||
Qd
|
Qd
|
||||||
Ih
|
zC
|
||||||
hY
|
hY
|
||||||
zC
|
zC
|
||||||
zC
|
zC
|
||||||
@@ -62017,7 +61966,7 @@ KY
|
|||||||
Nb
|
Nb
|
||||||
nx
|
nx
|
||||||
Nb
|
Nb
|
||||||
xU
|
Nb
|
||||||
Wx
|
Wx
|
||||||
WR
|
WR
|
||||||
Nb
|
Nb
|
||||||
@@ -62525,7 +62474,7 @@ TE
|
|||||||
is
|
is
|
||||||
RH
|
RH
|
||||||
lf
|
lf
|
||||||
CF
|
Me
|
||||||
jI
|
jI
|
||||||
QS
|
QS
|
||||||
is
|
is
|
||||||
@@ -63571,7 +63520,7 @@ ob
|
|||||||
gA
|
gA
|
||||||
Nb
|
Nb
|
||||||
Nb
|
Nb
|
||||||
LZ
|
WR
|
||||||
Nb
|
Nb
|
||||||
Nb
|
Nb
|
||||||
Qs
|
Qs
|
||||||
@@ -64335,11 +64284,11 @@ Eo
|
|||||||
yj
|
yj
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Me
|
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Me
|
Eo
|
||||||
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
EL
|
EL
|
||||||
@@ -65629,7 +65578,7 @@ Eo
|
|||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Me
|
Eo
|
||||||
Vj
|
Vj
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
@@ -66913,7 +66862,7 @@ Eo
|
|||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
aF
|
aF
|
||||||
Me
|
Eo
|
||||||
Vj
|
Vj
|
||||||
yI
|
yI
|
||||||
yj
|
yj
|
||||||
@@ -67184,7 +67133,7 @@ Eo
|
|||||||
Eo
|
Eo
|
||||||
Vj
|
Vj
|
||||||
VF
|
VF
|
||||||
Me
|
Eo
|
||||||
Eo
|
Eo
|
||||||
Eo
|
Eo
|
||||||
pI
|
pI
|
||||||
|
|||||||
@@ -431,8 +431,8 @@
|
|||||||
icon_living = "ouroboros"
|
icon_living = "ouroboros"
|
||||||
icon_dead = "slainouroboros"
|
icon_dead = "slainouroboros"
|
||||||
|
|
||||||
maxHealth = 300
|
maxHealth = 200
|
||||||
health = 300
|
health = 200
|
||||||
armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 20, bio = 100, rad = 100) //armor cause boss
|
armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 20, bio = 100, rad = 100) //armor cause boss
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
melee_attack_delay = 1 SECOND
|
melee_attack_delay = 1 SECOND
|
||||||
@@ -651,7 +651,7 @@
|
|||||||
to_chat(user, "<span class='warning'>This weapon is ineffective, it does no damage.</span>")
|
to_chat(user, "<span class='warning'>This weapon is ineffective, it does no damage.</span>")
|
||||||
visible_message("<span class='warning'>\The [user] gently taps [src] with \the [O].</span>")
|
visible_message("<span class='warning'>\The [user] gently taps [src] with \the [O].</span>")
|
||||||
|
|
||||||
|
/*
|
||||||
/mob/living/simple_mob/vore/candy/worm
|
/mob/living/simple_mob/vore/candy/worm
|
||||||
name = "hardcandy worm"
|
name = "hardcandy worm"
|
||||||
desc = "A creature made of candy."
|
desc = "A creature made of candy."
|
||||||
@@ -665,11 +665,13 @@
|
|||||||
maxHealth = 60
|
maxHealth = 60
|
||||||
health = 60
|
health = 60
|
||||||
|
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/candy/worm/death()
|
/mob/living/simple_mob/vore/candy/worm/death()
|
||||||
new /obj/random/mob/candycritter (src.loc)
|
new /obj/random/mob/candycritter (src.loc)
|
||||||
new /obj/random/mob/candycritter (src.loc)
|
new /obj/random/mob/candycritter (src.loc)
|
||||||
new /obj/random/mob/candycritter (src.loc)
|
new /obj/random/mob/candycritter (src.loc)
|
||||||
|
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/candy/worm/Login()
|
/mob/living/simple_mob/vore/candy/worm/Login()
|
||||||
. = ..()
|
. = ..()
|
||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
@@ -694,6 +696,7 @@
|
|||||||
|
|
||||||
B.emote_lists[DM_DIGEST] = list(
|
B.emote_lists[DM_DIGEST] = list(
|
||||||
"Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!")
|
"Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!")
|
||||||
|
*/
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/candy/peppermint/Login()
|
/mob/living/simple_mob/vore/candy/peppermint/Login()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
Reference in New Issue
Block a user