Skip to content

Commit

Permalink
well
Browse files Browse the repository at this point in the history
  • Loading branch information
MalorMorfin committed Dec 24, 2024
1 parent 60196ab commit a9b3a95
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
display_name = "Tadpole NK-Haul Model"

/datum/map_template/shuttle/minidropship/mobile_bar
suffix = "_mobile_bar"
suffix = "_mobile_bar"
description = "A Tadpole modified to provide drinks and disservices. God dammit it's him again, I thought we got rid of him."
display_name = "Tadpole Mobile-Bar Model"
admin_enable = FALSE
Expand All @@ -156,7 +156,7 @@
display_name = "Tadpole Combat Model"

/datum/map_template/shuttle/minidropship/umbilical
suffix = "_umbilical"
suffix = "_umbilical"
description = "A high-point orbital shuttle with a tactical umbilical airlock for insertion of ground troops."
display_name = "Tadpole Umbilical Model"

Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
var/wrenchable = FALSE
var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
var/mob/living/carbon/human/operator
//weight for tad check
var/weight_mashinery = 0

///Whether bullets can bypass the object even though it's dense
allow_pass_flags = PASSABLE
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
var/climb_delay = 50
var/flags_barrier = NONE
var/broken = FALSE //similar to machinery's stat BROKEN
var/weight_structure = 1
obj_flags = CAN_BE_HIT
anchored = TRUE
allow_pass_flags = PASSABLE
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures/barricade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
interaction_flags = INTERACT_CHECK_INCAPACITATED
max_integrity = 100
flags_barrier = HANDLE_BARRIER_CHANCE
weight_structure = 1
///The type of stack the barricade dropped when disassembled if any.
var/stack_type
///The amount of stack dropped when disassembled at full health
Expand Down
2 changes: 2 additions & 0 deletions code/modules/reqtorio/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
resistance_flags = XENO_DAMAGEABLE
flags_atom = PREVENT_CONTENTS_EXPLOSION
interaction_flags = INTERACT_MACHINE_TGUI
weight_mashinery = 1
///Curent items being processed
var/list/held_items
///Icon state displayed while something is being processed in the machine
Expand Down Expand Up @@ -151,6 +152,7 @@
anchored = FALSE // start off unanchored so its easier to move
resistance_flags = XENO_DAMAGEABLE
flags_atom = PREVENT_CONTENTS_EXPLOSION
weight_mashinery = 3
///Curent items being processed
var/item_to_fabricate = /obj/item/stack/sheet/metal/large_stack
///Icon state displayed while something is being processed in the machine
Expand Down
29 changes: 29 additions & 0 deletions code/modules/shuttle/mini_dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,33 @@
shuttle_port.assigned_transit.reserved_area.set_turf_type(/turf/open/space/transit/atmos)
open_prompt = TRUE

/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/proc/checkpayload()
var/area/tadarea = get_area(src)
var/weightintad = 0
for(var/turf/turfcontent in tadarea)
for(var/objectontad in turfcontent.contents)
if(isliving(objectontad))
var/mob/living/living = objectontad
weightintad += living.mob_size
if(isvehicle(objectontad))
var/obj/vehicle/vehicle = objectontad
weightintad += vehicle.weight_vehcial
if(ismachinery(objectontad))
var/obj/machinery/machinery = objectontad
weightintad += machinery.weight_mashinery
if(isstructure(objectontad))
var/obj/structure/structure = objectontad
weightintad += structure.weight_structure
if(weightintad > 60)
return FALSE
return TRUE

///The action of taking off and sending the shuttle to the atmosphere
/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/proc/take_off()
shuttle_port = SSshuttle.getShuttle(shuttleId)
if(!checkpayload())
to_chat(ui_user, span_warning("Tad too heavy to liftoff"))
return
#ifndef TESTING
if(!(shuttle_port.shuttle_flags & GAMEMODE_IMMUNE) && world.time < SSticker.round_start_time + SSticker.mode.deploy_time_lock)
to_chat(ui_user, span_warning("The mothership is too far away from the theatre of operation, we cannot take off."))
Expand All @@ -142,6 +166,11 @@

///The action of sending the shuttle back to its shuttle port on main ship
/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/proc/return_to_ship()
if(!checkpayload())
to_chat(ui_user, span_warning("Tad too heavy to liftoff"))
to_chat(ui_user, span_userdanger("EMERGENCY LANDING"))
SSshuttle.moveShuttleToDock(shuttleId, last_valid_ground_port, TRUE)
return
shuttle_port = SSshuttle.getShuttle(shuttleId)
shuttle_port.shuttle_computer = src
to_transit = TRUE
Expand Down
2 changes: 2 additions & 0 deletions code/modules/vehicles/__vehicle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
///This vehicle will follow us when we move (like atrailer duh)
var/obj/vehicle/trailer
var/are_legs_exposed = FALSE
// for tad check, how heavy is vehical
var/weight_vehcial = 3

/obj/vehicle/Initialize(mapload)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/vehicles/armored/__armored.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
move_delay = 0.7 SECONDS
max_integrity = 600
light_range = 10
weight_vehcial = 5
///Tank bitflags
var/flags_armored = ARMORED_HAS_PRIMARY_WEAPON|ARMORED_HAS_HEADLIGHTS
///Sound file(s) to play when we drive around
Expand Down
1 change: 1 addition & 0 deletions code/modules/vehicles/armored/_multitile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
light_pixel_y= 32
pixel_x = -56
pixel_y = -48
weight_vehcial = 10
max_integrity = 700
soft_armor = list(MELEE = 40, BULLET = 99 , LASER = 99, ENERGY = 60, BOMB = 60, BIO = 60, FIRE = 50, ACID = 40)
hard_armor = list(MELEE = 0, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
Expand Down

0 comments on commit a9b3a95

Please sign in to comment.