mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Raeschen <rycoop29@gmail.com> Co-authored-by: Raeschen <Raeschen@users.noreply.github.com> Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com> Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com> Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: CHOMPStation2 <chompsation2@gmail.com> Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com> Co-authored-by: Casey <a.roaming.shadow@gmail.com>
This commit is contained in:
Aroliacue
GitHub
@@ -21,7 +21,7 @@
|
||||
var/frame_state = "quad" //Custom-item proofing!
|
||||
var/paint_base = 'icons/obj/vehicles_64x64.dmi'
|
||||
var/custom_frame = FALSE
|
||||
var/datum/looping_sound/vehicle_engine/soundloop
|
||||
//var/datum/looping_sound/vehicle_engine/soundloop //Chomp REMOVE
|
||||
|
||||
paint_color = "#ffffff"
|
||||
|
||||
|
||||
@@ -2,18 +2,21 @@
|
||||
//I don't know what the hell I'm doing right now. Please help. Especially with the update_icons stuff. -Joan Risu
|
||||
|
||||
/obj/vehicle/train/rover/engine
|
||||
name = "NT Humvee"
|
||||
desc = "The NT version of the UF T-41LV, a Federation recon vehicle used as a personal transport. Can be latched to a trolly to transport equipment. "
|
||||
name = "\improper NT T-41LV Humvee" //ChompEDIT
|
||||
desc = "The corporate market model of the UF T-41LV, a SolGov reconnaissance and exploration vehicle, painted in Nanotrasen blue. Trailers can be latched for transporting heavy equipment, though its performance will noticeably degrade with more than one." //ChompEDIT
|
||||
icon = 'icons/vore/rover_vr.dmi'
|
||||
icon_state = "rover"
|
||||
light_power = 2 // CHOMPedit: 1 to 2, more light range.
|
||||
light_range = 6 // CHOMPedit: 3 to 6, more light range.
|
||||
on = 0
|
||||
powered = 1
|
||||
locked = 0
|
||||
move_delay = 0.5
|
||||
move_delay = 0.2 //CHOMPedit: Move delay reduced from 0.5 to 0.2.
|
||||
charge_use = 2.5 //CHOMPedit: Reduced from 5 to 2.5 for more fuel efficiency, being a dedicated transport vehicle.
|
||||
|
||||
//Health stuff
|
||||
health = 100
|
||||
maxhealth = 100
|
||||
health = 250 // CHOMPedit: 100 to 250. Cars are usually just a bit tougher than humans.
|
||||
maxhealth = 250 // CHOMPedit: Cars are usually just a bit tougher than humans.
|
||||
fire_dam_coeff = 0.6
|
||||
brute_dam_coeff = 0.5
|
||||
|
||||
@@ -22,8 +25,8 @@
|
||||
pixel_x = -8
|
||||
pixel_y = -8
|
||||
|
||||
|
||||
var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching.
|
||||
var/car_limit = 1 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching.
|
||||
//CHOMPedit: Set to 1 because the thing slows down to a crawl with even one trailer. Unhitching doesn't occur at regular movement speeds, or even at faster speeds than base.
|
||||
active_engines = 1
|
||||
var/obj/item/weapon/key/rover/key
|
||||
var/siren = 0 //This is for eventually getting the siren sprite to work.
|
||||
@@ -35,8 +38,8 @@
|
||||
icon_state = "dunebug"
|
||||
|
||||
/obj/item/weapon/key/rover
|
||||
name = "The Rover key"
|
||||
desc = "The Rover key used to start it."
|
||||
name = "\improper ignition key" //CHOMPedit: Name update
|
||||
desc = "A universal electronic tri-key for starting most Nanotrasen vehicles." //CHOMPedit: Desc update
|
||||
icon = 'icons/obj/vehicles_vr.dmi'
|
||||
icon_state = "securikey"
|
||||
w_class = ITEMSIZE_TINY
|
||||
@@ -389,7 +392,7 @@
|
||||
else
|
||||
move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains
|
||||
move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines)
|
||||
move_delay += config.run_speed //base reference speed
|
||||
move_delay += 1 //base reference speed //CHOMPedit: Move-delay from server config (2) to 1.
|
||||
move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight
|
||||
|
||||
/obj/vehicle/train/rover/trolley/update_car(var/train_length, var/active_engines)
|
||||
|
||||
@@ -42,15 +42,25 @@
|
||||
var/load_offset_y = 0 //pixel_y offset for item overlay
|
||||
var/mob_offset_y = 0 //pixel_y offset for mob overlay
|
||||
|
||||
var/datum/looping_sound/idle_carengine/soundloop //CHOMPedit: Looping engine audio.
|
||||
|
||||
//-------------------------------------------
|
||||
// Standard procs
|
||||
//-------------------------------------------
|
||||
/obj/vehicle/New()
|
||||
..()
|
||||
//spawn the cell you want in each vehicle
|
||||
//ChompADD START
|
||||
/obj/vehicle/Initialize()
|
||||
.=..()
|
||||
soundloop = new(list(src), FALSE)
|
||||
return
|
||||
//ChompADD END
|
||||
|
||||
///obj/vehicle/New()
|
||||
// ..()
|
||||
// //spawn the cell you want in each vehicle // CHOMPedit: Commented out in favour of initialize.
|
||||
|
||||
/obj/vehicle/Destroy()
|
||||
QDEL_NULL(riding_datum)
|
||||
QDEL_NULL(soundloop) //ChompADD
|
||||
return ..()
|
||||
|
||||
//BUCKLE HOOKS
|
||||
@@ -200,7 +210,8 @@
|
||||
if(on)
|
||||
return FALSE
|
||||
on = 1
|
||||
playsound(src, 'sound/machines/vehicle/ignition.ogg', 50, 1, -3)
|
||||
playsound(src, 'modular_chomp/sound/effects/vehicle/ignition_car.ogg', 60, 2, -2) //CHOMPedit: New sound effects.
|
||||
soundloop.start()
|
||||
set_light(initial(light_range))
|
||||
update_icon()
|
||||
return TRUE
|
||||
@@ -211,6 +222,8 @@
|
||||
if(!mechanical)
|
||||
return FALSE
|
||||
on = 0
|
||||
playsound(src, 'modular_chomp/sound/effects/vehicle/engine_off.ogg', 60, 2, -2) //CHOMPedit: New sound effects.
|
||||
soundloop.stop()
|
||||
set_light(0)
|
||||
update_icon()
|
||||
|
||||
@@ -227,6 +240,7 @@
|
||||
|
||||
/obj/vehicle/proc/explode()
|
||||
src.visible_message("<font color='red'><B>[src] blows apart!</B></font>", 1)
|
||||
playsound(src, 'modular_chomp/sound/effects/explosions/vehicleexplosion.ogg', 100, 8, 3) //CHOMPedit: New sound effects.
|
||||
var/turf/Tsec = get_turf(src)
|
||||
|
||||
//stuns people who are thrown off a train that has been blown up
|
||||
@@ -418,3 +432,18 @@
|
||||
new /obj/effect/decal/cleanable/blood/oil(src.loc)
|
||||
spawn(1) healthcheck()
|
||||
return 1
|
||||
|
||||
//ChompADD START
|
||||
//----------------------------
|
||||
// Engine sounds datum
|
||||
//----------------------------
|
||||
|
||||
/datum/looping_sound/idle_carengine
|
||||
mid_sounds = 'modular_chomp/sound/effects/vehicle/engine_loop.ogg'
|
||||
mid_length = 2.60 SECONDS
|
||||
chance = 100
|
||||
volume = 10
|
||||
exclusive = TRUE
|
||||
volume_chan = VOLUME_CHANNEL_AMBIENCE
|
||||
|
||||
//ChompADD END
|
||||
|
||||
Reference in New Issue
Block a user