mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
More balance fixes
Weh
This commit is contained in:
@@ -203,6 +203,16 @@
|
|||||||
/obj/fiftyspawner/steel,
|
/obj/fiftyspawner/steel,
|
||||||
/obj/fiftyspawner/glass,
|
/obj/fiftyspawner/glass,
|
||||||
/obj/machinery/recharger,
|
/obj/machinery/recharger,
|
||||||
|
/obj/effect/floor_decal/corner/orange/diagonal,
|
||||||
|
/turf/simulated/floor/tiled/red,
|
||||||
|
/area/awaymission/mol/security)
|
||||||
|
"dJ" = (
|
||||||
|
/obj/structure/table/rack/shelf,
|
||||||
|
/obj/item/clothing/suit/armor/combat/imperial,
|
||||||
|
/obj/item/clothing/gloves/arm_guard/combat/imperial,
|
||||||
|
/obj/item/clothing/head/helmet/combat/imperial,
|
||||||
|
/obj/item/clothing/shoes/leg_guard/combat/imperial,
|
||||||
|
/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)
|
||||||
"dK" = (
|
"dK" = (
|
||||||
@@ -362,6 +372,7 @@
|
|||||||
/obj/machinery/light{
|
/obj/machinery/light{
|
||||||
dir = 8
|
dir = 8
|
||||||
},
|
},
|
||||||
|
/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)
|
||||||
"gy" = (
|
"gy" = (
|
||||||
@@ -826,7 +837,7 @@
|
|||||||
},
|
},
|
||||||
/area/awaymission/mol/entrancetunnel)
|
/area/awaymission/mol/entrancetunnel)
|
||||||
"mA" = (
|
"mA" = (
|
||||||
/obj/effect/fake_sun,
|
/obj/effect/fake_sun/cool,
|
||||||
/turf/simulated/wall/solidrock,
|
/turf/simulated/wall/solidrock,
|
||||||
/area/awaymission/mol/mines)
|
/area/awaymission/mol/mines)
|
||||||
"mB" = (
|
"mB" = (
|
||||||
@@ -1041,6 +1052,7 @@
|
|||||||
/obj/structure/table/rack/shelf,
|
/obj/structure/table/rack/shelf,
|
||||||
/obj/item/weapon/melee/energy/sword/imperial,
|
/obj/item/weapon/melee/energy/sword/imperial,
|
||||||
/obj/item/weapon/shield/energy/imperial,
|
/obj/item/weapon/shield/energy/imperial,
|
||||||
|
/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)
|
||||||
"ps" = (
|
"ps" = (
|
||||||
@@ -1736,6 +1748,7 @@
|
|||||||
"yK" = (
|
"yK" = (
|
||||||
/obj/structure/table/rack/shelf,
|
/obj/structure/table/rack/shelf,
|
||||||
/obj/item/weapon/gun/energy/imperial,
|
/obj/item/weapon/gun/energy/imperial,
|
||||||
|
/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)
|
||||||
"yO" = (
|
"yO" = (
|
||||||
@@ -1831,6 +1844,13 @@
|
|||||||
"zC" = (
|
"zC" = (
|
||||||
/turf/simulated/wall/r_wall,
|
/turf/simulated/wall/r_wall,
|
||||||
/area/awaymission/mol/kitchen/chamberC)
|
/area/awaymission/mol/kitchen/chamberC)
|
||||||
|
"zE" = (
|
||||||
|
/obj/machinery/door/blast/puzzle{
|
||||||
|
id = "FinaleGate2"
|
||||||
|
},
|
||||||
|
/obj/effect/floor_decal/corner/orange/diagonal,
|
||||||
|
/turf/simulated/floor/tiled/red,
|
||||||
|
/area/awaymission/mol/security)
|
||||||
"zF" = (
|
"zF" = (
|
||||||
/obj/structure/table/hardwoodtable,
|
/obj/structure/table/hardwoodtable,
|
||||||
/obj/random/maintenance/foodstuff,
|
/obj/random/maintenance/foodstuff,
|
||||||
@@ -2048,6 +2068,7 @@
|
|||||||
dir = 1
|
dir = 1
|
||||||
},
|
},
|
||||||
/obj/machinery/autolathe/armory,
|
/obj/machinery/autolathe/armory,
|
||||||
|
/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)
|
||||||
"CO" = (
|
"CO" = (
|
||||||
@@ -2105,6 +2126,7 @@
|
|||||||
"DP" = (
|
"DP" = (
|
||||||
/obj/structure/table/rack/shelf,
|
/obj/structure/table/rack/shelf,
|
||||||
/obj/item/weapon/storage/firstaid/bonemed,
|
/obj/item/weapon/storage/firstaid/bonemed,
|
||||||
|
/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)
|
||||||
"DR" = (
|
"DR" = (
|
||||||
@@ -2218,6 +2240,7 @@
|
|||||||
/obj/machinery/door/blast/puzzle{
|
/obj/machinery/door/blast/puzzle{
|
||||||
id = "FinaleGate1"
|
id = "FinaleGate1"
|
||||||
},
|
},
|
||||||
|
/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)
|
||||||
"Fe" = (
|
"Fe" = (
|
||||||
@@ -2498,6 +2521,7 @@
|
|||||||
/obj/machinery/light{
|
/obj/machinery/light{
|
||||||
dir = 4
|
dir = 4
|
||||||
},
|
},
|
||||||
|
/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)
|
||||||
"Ik" = (
|
"Ik" = (
|
||||||
@@ -2763,6 +2787,7 @@
|
|||||||
"LY" = (
|
"LY" = (
|
||||||
/obj/structure/table/rack/shelf,
|
/obj/structure/table/rack/shelf,
|
||||||
/obj/item/weapon/storage/firstaid/clotting,
|
/obj/item/weapon/storage/firstaid/clotting,
|
||||||
|
/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)
|
||||||
"Mb" = (
|
"Mb" = (
|
||||||
@@ -3577,6 +3602,7 @@
|
|||||||
/obj/machinery/door/blast/puzzle{
|
/obj/machinery/door/blast/puzzle{
|
||||||
id = "FinaleGate4"
|
id = "FinaleGate4"
|
||||||
},
|
},
|
||||||
|
/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)
|
||||||
"Wh" = (
|
"Wh" = (
|
||||||
@@ -3717,6 +3743,7 @@
|
|||||||
/turf/simulated/floor/tiled/steel,
|
/turf/simulated/floor/tiled/steel,
|
||||||
/area/awaymission/mol/kitchen)
|
/area/awaymission/mol/kitchen)
|
||||||
"Yj" = (
|
"Yj" = (
|
||||||
|
/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)
|
||||||
"Yl" = (
|
"Yl" = (
|
||||||
@@ -32060,32 +32087,32 @@ Ae
|
|||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
|
kL
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
kL
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
kL
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
|
kL
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
kL
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
@@ -32573,7 +32600,7 @@ Nh
|
|||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
Ae
|
Ae
|
||||||
rt
|
oH
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
@@ -33865,7 +33892,7 @@ Nh
|
|||||||
Ae
|
Ae
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
Qh
|
||||||
Ae
|
Ae
|
||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
@@ -33878,19 +33905,19 @@ Nh
|
|||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
iA
|
iA
|
||||||
qP
|
dJ
|
||||||
Yj
|
Yj
|
||||||
fZ
|
fZ
|
||||||
Yj
|
Yj
|
||||||
qP
|
dJ
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
qP
|
dJ
|
||||||
Yj
|
Yj
|
||||||
fZ
|
fZ
|
||||||
Yj
|
Yj
|
||||||
qP
|
dJ
|
||||||
iA
|
iA
|
||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
@@ -34895,7 +34922,7 @@ Nh
|
|||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
Ae
|
Ae
|
||||||
rt
|
oH
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
Ae
|
Ae
|
||||||
@@ -34920,7 +34947,7 @@ iA
|
|||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
CO
|
zE
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
@@ -35178,7 +35205,7 @@ iA
|
|||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
CO
|
zE
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
@@ -35929,7 +35956,7 @@ FS
|
|||||||
FS
|
FS
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
Qh
|
||||||
Ae
|
Ae
|
||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
@@ -36726,7 +36753,7 @@ iA
|
|||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
CO
|
zE
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
@@ -36959,7 +36986,7 @@ Nh
|
|||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
Ae
|
Ae
|
||||||
rt
|
oH
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
Ae
|
Ae
|
||||||
@@ -36984,7 +37011,7 @@ iA
|
|||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
CO
|
zE
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
@@ -37993,7 +38020,7 @@ Nh
|
|||||||
Ae
|
Ae
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
Qh
|
||||||
Ae
|
Ae
|
||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
@@ -38006,11 +38033,11 @@ Nh
|
|||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
iA
|
iA
|
||||||
qP
|
dJ
|
||||||
Yj
|
Yj
|
||||||
Ii
|
Ii
|
||||||
Yj
|
Yj
|
||||||
qP
|
dJ
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
iA
|
iA
|
||||||
@@ -39281,7 +39308,7 @@ Nh
|
|||||||
Nh
|
Nh
|
||||||
Nh
|
Nh
|
||||||
Ae
|
Ae
|
||||||
rt
|
oH
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
@@ -39800,6 +39827,13 @@ Ae
|
|||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
|
ZY
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
rt
|
||||||
|
ZY
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
@@ -39807,19 +39841,12 @@ rt
|
|||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
|
ZY
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
ZY
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
rt
|
rt
|
||||||
|
|||||||
@@ -104,23 +104,23 @@
|
|||||||
|
|
||||||
//Spells
|
//Spells
|
||||||
/obj/item/projectile/energy/homing_bolt/wizard
|
/obj/item/projectile/energy/homing_bolt/wizard
|
||||||
damage = 12
|
damage = 15
|
||||||
|
|
||||||
/obj/item/projectile/energy/homing_bolt/wizard/fire
|
/obj/item/projectile/energy/homing_bolt/wizard/fire
|
||||||
modifier_type_to_apply = /datum/modifier/wizfire
|
modifier_type_to_apply = /datum/modifier/wizfire
|
||||||
modifier_duration = 8 SECONDS
|
modifier_duration = 6 SECONDS
|
||||||
|
|
||||||
/obj/item/projectile/energy/homing_bolt/wizard/lighting
|
/obj/item/projectile/energy/homing_bolt/wizard/lighting
|
||||||
modifier_type_to_apply = /datum/modifier/wizfire/lighting
|
modifier_type_to_apply = /datum/modifier/wizfire/lighting
|
||||||
modifier_duration = 8 SECONDS
|
modifier_duration = 6 SECONDS
|
||||||
|
|
||||||
/obj/item/projectile/energy/homing_bolt/wizard/poison
|
/obj/item/projectile/energy/homing_bolt/wizard/poison
|
||||||
modifier_type_to_apply = /datum/modifier/wizpoison
|
modifier_type_to_apply = /datum/modifier/wizpoison
|
||||||
modifier_duration = 8 SECONDS
|
modifier_duration = 6 SECONDS
|
||||||
|
|
||||||
/obj/item/projectile/energy/homing_bolt/wizard/frost
|
/obj/item/projectile/energy/homing_bolt/wizard/frost
|
||||||
modifier_type_to_apply = /datum/modifier/wizpoison/frost
|
modifier_type_to_apply = /datum/modifier/wizpoison/frost
|
||||||
modifier_duration = 8 SECONDS
|
modifier_duration = 6 SECONDS
|
||||||
|
|
||||||
/datum/modifier/wizfire
|
/datum/modifier/wizfire
|
||||||
name = "wizfire"
|
name = "wizfire"
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
melee_damage_lower = 15
|
melee_damage_lower = 15
|
||||||
melee_damage_upper = 15
|
melee_damage_upper = 15
|
||||||
|
unity = 1
|
||||||
|
|
||||||
/mob/living/simple_mob/slime/feral/apply_melee_effects(mob/living/L)
|
/mob/living/simple_mob/slime/feral/apply_melee_effects(mob/living/L)
|
||||||
if(istype(L) && a_intent == I_HURT)
|
if(istype(L) && a_intent == I_HURT)
|
||||||
|
|||||||
Reference in New Issue
Block a user