cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Random Fixes (#7683)

Browse Source
This commit is contained in:
FluffMedic
2024-02-04 10:00:51 -05:00
committed by GitHub
parent f134c70c9d
commit 66d0bcc78b
5 changed files with 198 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
maps/southern_cross/submaps/gateway/hiddeneclipse.dmm
View File

@@ -81,6 +81,15 @@
/obj/machinery/door/airlock/silver,
/turf/simulated/floor/tiled/old_tile/gray,
/area/awaymission/hiddeneclipse/eclipsecarrier/vipdefense)
"bY" = (
/obj/effect/floor_decal/corner/lightgrey/diagonal,
/obj/machinery/light{
dir = 4;
icon_state = "tube1";
pixel_x = 0
},
/turf/simulated/floor/tiled/old_tile/gray,
/area/awaymission/hiddeneclipse/eclipsecarrier/cafe)
"cd" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
@@ -99,6 +108,20 @@
},
/turf/simulated/shuttle/floor/alienplating/blue,
/area/awaymission/hiddeneclipse/precursortemple)
"cl" = (
/obj/effect/floor_decal/corner/green/diagonal,
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/random/maintenance/foodstuff,
/obj/random/maintenance/foodstuff,
/obj/random/maintenance/foodstuff,
/obj/random/maintenance/foodstuff,
/obj/machinery/light{
dir = 4;
icon_state = "tube1";
pixel_x = 0
},
/turf/simulated/floor/tiled/old_tile/green,
/area/awaymission/hiddeneclipse/eclipsecarrier/kitchen)
"cn" = (
/turf/simulated/shuttle/wall/alien/blue,
/area/awaymission/hiddeneclipse)
@@ -296,6 +319,17 @@
/obj/machinery/door/blast/regular,
/turf/simulated/floor/plating,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"gJ" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
/obj/random/maintenance/research,
/obj/random/maintenance/research,
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/item/mecha_parts/part/hades_left_arm,
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"gS" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
@@ -315,6 +349,7 @@
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/item/mecha_parts/chassis/hades,
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"hi" = (
@@ -382,6 +417,11 @@
/mob/living/simple_mob/humanoid/eclipse/solar/teslanoodle,
/turf/simulated/floor/tiled/red,
/area/awaymission/hiddeneclipse/eclipsecarrier)
"iR" = (
/obj/effect/floor_decal/corner/lightorange/diagonal,
/obj/machinery/light,
/turf/simulated/floor/tiled/red,
/area/awaymission/hiddeneclipse/eclipsecarrier)
"iU" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka,
@@ -476,6 +516,9 @@
"lG" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/flamegun,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/awaymission/hiddeneclipse/eclipsecarrier/armory)
"lJ" = (
@@ -559,6 +602,14 @@
},
/turf/simulated/shuttle/floor/alien/blue,
/area/awaymission/hiddeneclipse/precursortemple)
"nv" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
/obj/random/maintenance/research,
/obj/random/maintenance/research,
/obj/item/mecha_parts/part/hades_right_leg,
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"ny" = (
/obj/effect/floor_decal/corner/lightorange/diagonal,
/mob/living/simple_mob/humanoid/eclipse/solar/firemoff,
@@ -755,6 +806,19 @@
/obj/effect/forcefield/mime,
/turf/simulated/floor/cult,
/area/awaymission/hiddeneclipse/theabyss)
"qT" = (
/obj/effect/floor_decal/corner/green/diagonal,
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/random/maintenance/foodstuff,
/obj/random/maintenance/foodstuff,
/obj/random/maintenance/foodstuff,
/obj/random/maintenance/foodstuff,
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
},
/turf/simulated/floor/tiled/old_tile/green,
/area/awaymission/hiddeneclipse/eclipsecarrier/kitchen)
"rd" = (
/obj/structure/fans/hardlight/colorable,
/turf/simulated/floor/concrete,
@@ -846,6 +910,14 @@
},
/turf/simulated/shuttle/floor/alien/blue,
/area/awaymission/hiddeneclipse/precursortemple)
"tZ" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
/obj/random/maintenance/research,
/obj/random/maintenance/research,
/obj/item/mecha_parts/part/hades_torso,
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"ua" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/effect/floor_decal/corner/mauve/border{
@@ -912,6 +984,17 @@
/obj/item/stack/material/void_opal,
/turf/simulated/floor/tiled/techfloor,
/area/awaymission/hiddeneclipse/eclipsecarrier/armory)
"vk" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
/obj/random/maintenance/research,
/obj/random/maintenance/research,
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/item/mecha_parts/part/hades_right_arm,
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"vn" = (
/obj/effect/simple_portal/coords{
tele_x = 187;
@@ -1169,6 +1252,17 @@
},
/turf/simulated/floor/tiled/old_tile/yellow,
/area/awaymission/hiddeneclipse/eclipsecarrier/engine)
"Aj" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/structure/table/steel,
/obj/random/maintenance/research,
/obj/random/maintenance/research,
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/item/mecha_parts/part/hades_left_leg,
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"Al" = (
/obj/effect/floor_decal/corner/purple/diagonal,
/obj/machinery/gibber,
@@ -1236,6 +1330,11 @@
"Bo" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/elementalray,
/obj/machinery/light{
dir = 4;
icon_state = "tube1";
pixel_x = 0
},
/turf/simulated/floor/tiled/techfloor,
/area/awaymission/hiddeneclipse/eclipsecarrier/armory)
"Bp" = (
@@ -1779,6 +1878,15 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/awaymission/hiddeneclipse/eclipsecarrier/helm)
"JR" = (
/obj/structure/table/marble,
/obj/effect/floor_decal/corner/green/diagonal,
/obj/random/maintenance/foodstuff,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled/old_tile/green,
/area/awaymission/hiddeneclipse/eclipsecarrier/kitchen)
"Km" = (
/turf/simulated/wall/rpshull,
/area/awaymission/hiddeneclipse/miningzonea)
@@ -1797,6 +1905,11 @@
/obj/effect/floor_decal/corner/lightorange,
/turf/simulated/floor/tiled/old_tile/red,
/area/awaymission/hiddeneclipse/eclipsecarrier/prison)
"KF" = (
/obj/effect/floor_decal/corner/lightgrey/diagonal,
/obj/machinery/light,
/turf/simulated/floor/tiled/old_tile/gray,
/area/awaymission/hiddeneclipse/eclipsecarrier/cafe)
"KG" = (
/obj/structure/table/rack,
/obj/item/weapon/circuitboard/shield_gen_ex,
@@ -2081,6 +2194,14 @@
},
/turf/simulated/floor/tiled/old_tile/purple,
/area/awaymission/hiddeneclipse/eclipsecarrier/science)
"PW" = (
/obj/effect/floor_decal/corner/lightgrey/diagonal,
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
},
/turf/simulated/floor/tiled/old_tile/gray,
/area/awaymission/hiddeneclipse/eclipsecarrier/cafe)
"Qa" = (
/mob/living/simple_mob/mechanical/mecha/ripley/red_flames{
faction = "Possessed"
@@ -2143,6 +2264,15 @@
/obj/effect/floor_decal/corner/lightorange,
/turf/simulated/floor/tiled/old_tile/red,
/area/awaymission/hiddeneclipse/eclipsecarrier/prison)
"Re" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/elementalray,
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
},
/turf/simulated/floor/tiled/techfloor,
/area/awaymission/hiddeneclipse/eclipsecarrier/armory)
"Ro" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/item/borg/upgrade/modkit/aoe,
@@ -53362,7 +53492,7 @@ wN
wN
dz
dz
dz
qT
dz
dz
dz
@@ -53370,12 +53500,12 @@ Vs
xO
xO
xO
PW
xO
xO
xO
xO
xO
xO
PW
xO
xO
xO
@@ -54131,7 +54261,7 @@ Fu
ez
ez
yA
hl
JR
wN
wN
hl
@@ -54152,7 +54282,7 @@ xO
eZ
eZ
xO
xO
KF
yA
yA
dD
@@ -55679,7 +55809,7 @@ Fu
ez
ez
yA
hl
JR
wN
wN
hl
@@ -55700,7 +55830,7 @@ xO
eZ
eZ
xO
xO
KF
yA
yA
dD
@@ -56458,7 +56588,7 @@ wN
wN
dz
dz
dz
cl
dz
dz
dz
@@ -56466,12 +56596,12 @@ Vs
xO
xO
xO
bY
xO
xO
xO
xO
xO
xO
bY
xO
xO
xO
@@ -56983,11 +57113,11 @@ MY
MY
MY
MY
JI
MY
MY
MY
MY
MY
JI
MY
MY
MY
@@ -57002,11 +57132,11 @@ MY
MY
MY
MY
JI
MY
MY
MY
MY
MY
JI
Og
Pt
Pt
@@ -57456,7 +57586,7 @@ yT
MY
MY
MY
MY
Cl
MY
MY
MY
@@ -58233,7 +58363,7 @@ FS
FS
FS
FS
Bo
Re
FS
FS
FS
@@ -58484,7 +58614,7 @@ yA
yA
MY
MY
MY
iR
yA
yA
FS
@@ -60032,7 +60162,7 @@ yA
yA
MY
MY
MY
iR
yA
yA
FS
@@ -61068,7 +61198,7 @@ CD
MY
MY
MY
MY
JI
MY
MY
MY
@@ -61626,11 +61756,11 @@ MY
MY
MY
MY
Cl
MY
MY
MY
MY
MY
Cl
MY
MY
MY
@@ -61646,11 +61776,11 @@ MY
MY
MY
MY
Cl
MY
MY
MY
MY
MY
Cl
Og
Pt
Pt
@@ -62640,7 +62770,7 @@ oT
oT
Sa
Sa
Sa
nv
Sa
sq
Oa
@@ -63406,7 +63536,7 @@ aX
Gp
Bn
Sa
Sa
tZ
Sa
Sa
oT
@@ -64950,14 +65080,14 @@ nD
WL
WL
WL
WL
vk
Cy
Cy
WL
WL
Aj
Eu
WL
WL
gJ
cd
Oa
uz

2
modular_chomp/code/modules/clothing/spacesuits/rig/crystal.dm
View File

@@ -3,7 +3,7 @@
desc = "An oddly lightweight rigsuit from a strange crystaline creature."
suit_type = "crystal hardsuit"
icon = 'modular_chomp/icons/obj/rig_modules_ch.dmi'
icon_state = "aegis_rig"
icon_state = "crystal_rig"
armor = list(melee = 50, bullet = 50, laser = 30, energy = 30, bomb = 0, bio = 100, rad = 100)
emp_protection = 50

19
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
View File

@@ -58,7 +58,8 @@
reload_max = 7 // Not the best default, but it fits the pistol
ai_holder_type = /datum/ai_holder/simple_mob/merc/eclipse/ranged
loot_list = list(/obj/item/slime_extract/sepia = 0.1,
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/weapon/bone/skull = 100
)
special_attack_cooldown = 15 SECONDS
@@ -257,6 +258,10 @@
glow_range = 5
glow_intensity = 3
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/weapon/bone/skull/unathi = 100
)
projectiletype = /obj/item/projectile/energy/declone/burn
var/rads = 5
@@ -557,6 +562,10 @@
icon_living = "eclipse_guardian"
reload_max = 10
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/slime_extract/grey = 100
)
/mob/living/simple_mob/humanoid/eclipse/solar/guardian/handle_special()
if(stat != DEAD)
heal_aura()
@@ -620,6 +629,10 @@
ranged_attack_delay = 1.5 SECONDS
hovering = TRUE
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/slime_extract/grey = 100
)
var/exploded = FALSE
var/explosion_dev_range = 0
var/explosion_heavy_range = 1
@@ -700,6 +713,10 @@
icon_state = "miner"
icon_living = "miner"
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/slime_extract/grey = 100
)
/mob/living/simple_mob/humanoid/eclipse/lunar/miner/do_special_attack(atom/A)
new /mob/living/simple_mob/mechanical/mining_drone/scavenger/eclipse (src.loc)
..(null,"creates a mining drone.")

5
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm
View File

@@ -20,6 +20,7 @@
special_attack_min_range = 1
special_attack_max_range = 8
loot_list = list(/obj/item/weapon/gun/energy/flamegun = 100,
/obj/item/weapon/bone/skull = 100
)
@@ -132,6 +133,7 @@
loot_list = list(/obj/item/weapon/circuitboard/mecha/hades/targeting = 100,
/obj/item/weapon/circuitboard/mecha/hades/peripherals = 100,
/obj/item/weapon/circuitboard/mecha/hades/main = 100,
/obj/item/weapon/bone/skull = 100
)
var/obj/item/shield_projector/shield1 = null
@@ -208,7 +210,8 @@
/obj/item/weapon/cell/device/weapon/recharge/alien = 60,
/obj/item/weapon/bluespace_harpoon = 60,
/obj/item/weapon/flame/lighter/supermatter/syndismzippo = 60,
/obj/item/weapon/gun/energy/medigun = 60
/obj/item/weapon/gun/energy/medigun = 60,
/obj/item/weapon/bone/skull = 100
)
var/obj/item/shield_projector/shield1 = null

28
modular_chomp/code/modules/projectiles/precursor/eclipse.dm
View File

@@ -20,12 +20,13 @@
reload_time = 10
move_delay = 0
firemodes = list(
list(mode_name="normal", fire_delay=5, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 80),
list(mode_name="shotgun", fire_delay=15, projectile_type=/obj/item/projectile/bullet/frostshotgun, charge_cost = 240),
)
/obj/item/weapon/gun/energy/flamegun
name = "Flame Crystal Projector"
desc = "A strange gun pulsing with energy, it's touch warming you up."
@@ -46,6 +47,8 @@
recoil_mode = 0
charge_meter = 1
move_delay = 0
charge_cost = 80
reload_time = 10
@@ -74,25 +77,28 @@
recoil_mode = 0
charge_meter = 1
move_delay = 0
charge_cost = 160
reload_time = 20
firemodes = list(
list(mode_name="fire", fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160),
list(mode_name="lighting", fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 240),
list(mode_name="acid", fire_delay=1, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10),
list(mode_name="fire", burst=1, fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160, modifystate="avatarfire"),
list(mode_name="lighting", burst=1, fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480, modifystate="avatarlighting"),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 260, modifystate="avatarfrost"),
list(mode_name="acid", burst=1, fire_delay=0.5, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10, modifystate="avataracid"),
)
/obj/item/weapon/gun/energy/elementalray/emag_act(var/remaining_charges, var/mob/user)
..()
to_chat(user, "<span class='notice'>You short circuit the internal locking mechanisms of \the [src]!</span>")
firemodes = list(
list(mode_name="fire", fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160),
list(mode_name="lighting", fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 240),
list(mode_name="acid", fire_delay=1, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10),
list(mode_name="error", fire_delay=30, projectile_type=/obj/item/projectile/bullet/errorelement, charge_cost = 1040)
list(mode_name="fire", burst=1, fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160),
list(mode_name="lighting", burst=1, fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 160),
list(mode_name="acid", burst=1, fire_delay=0.5, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10),
list(mode_name="error", burst=1, fire_delay=30, projectile_type=/obj/item/projectile/bullet/errorelement, charge_cost = 1040),
)
return 1
@@ -130,7 +136,7 @@
on_expired_text = "<span class='notice'>You are no longer covered in muck.</span>"
stacks = MODIFIER_STACK_ALLOWED
slowdown = 0.5
slowdown = 0.2
/obj/item/weapon/gun/energy/pulseglove