cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Remove uneccesary var copy paste from vehicles [MDB IGNORE] (#16513)

Browse Source 
* Remove uneccesary var copy paste from vehicles (#70167)

Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>

* Remove uneccesary var copy paste from vehicles

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>
This commit is contained in:
SkyratBot
2022-09-28 21:17:48 +01:00
committed by GitHub
co-authored by TiviPlus TiviPlus
parent a280a8e12a
commit de331bbe60
6 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/atv.dm
+1 -5
View File
@@ -7,8 +7,6 @@
armor = list(MELEE = 50, BULLET = 25, LASER = 20, ENERGY = 0, BOMB = 50, BIO = 0, FIRE = 60, ACID = 60)
key_type = /obj/item/key/atv
integrity_failure = 0.5
///What mobs are currently repairing us.
var/list/mob/living/repairing_mobs
var/static/mutable_appearance/atvcover
/obj/vehicle/ridden/atv/Initialize(mapload)
@@ -74,7 +72,7 @@
if(user.combat_mode)
return
. = TRUE
if(LAZYFIND(repairing_mobs, user))
if(DOING_INTERACTION(user, src))
balloon_alert(user, "you're already repairing it!")
return
if(atom_integrity >= max_integrity)
@@ -82,7 +80,6 @@
return
if(!W.tool_start_check(user, amount=1))
return
LAZYADD(repairing_mobs, user)
user.balloon_alert_to_viewers("started welding [src]", "started repairing [src]")
audible_message(span_hear("You hear welding."))
var/did_the_thing
@@ -97,7 +94,6 @@
user.balloon_alert_to_viewers("[(atom_integrity >= max_integrity) ? "fully" : "partially"] repaired [src]")
else
user.balloon_alert_to_viewers("stopped welding [src]", "interrupted the repair!")
LAZYREMOVE(repairing_mobs, user)
/obj/vehicle/ridden/atv/atom_break()
START_PROCESSING(SSobj, src)
code/modules/vehicles/bicycle.dm
+1 -5
View File
@@ -5,8 +5,6 @@
max_integrity = 150
integrity_failure = 0.5
var/fried = FALSE
///What mobs are currently repairing us.
var/list/mob/living/repairing_mobs
/obj/vehicle/ridden/bicycle/Initialize(mapload)
. = ..()
@@ -29,7 +27,7 @@
. = TRUE
if(fried)
balloon_alert(user, "it's fried!")
if(LAZYFIND(repairing_mobs, user))
if(DOING_INTERACTION(user, src))
balloon_alert(user, "you're already repairing it!")
return
if(atom_integrity >= max_integrity)
@@ -37,7 +35,6 @@
return
if(!W.tool_start_check(user, amount=1))
return
LAZYADD(repairing_mobs, user)
user.balloon_alert_to_viewers("started welding [src]", "started repairing [src]")
audible_message(span_hear("You hear welding."))
var/did_the_thing
@@ -52,7 +49,6 @@
user.balloon_alert_to_viewers("[(atom_integrity >= max_integrity) ? "fully" : "partially"] repaired [src]")
else
user.balloon_alert_to_viewers("stopped welding [src]", "interrupted the repair!")
LAZYREMOVE(repairing_mobs, user)
///can we still fix the bike lol
/obj/vehicle/ridden/bicycle/proc/can_still_fix()
code/modules/vehicles/cars/vim.dm
+1 -5
View File
@@ -18,8 +18,6 @@
light_power = 2
light_on = FALSE
engine_sound = 'sound/effects/servostep.ogg'
///What mobs are currently repairing us.
var/list/mob/living/repairing_mobs
///Maximum size of a mob trying to enter the mech
var/maximum_mob_size = MOB_SIZE_SMALL
COOLDOWN_DECLARE(sound_cooldown)
@@ -55,7 +53,7 @@
if(user.combat_mode)
return
. = TRUE
if(LAZYFIND(repairing_mobs, user))
if(DOING_INTERACTION(user, src))
balloon_alert(user, "you're already repairing it!")
return
if(atom_integrity >= max_integrity)
@@ -63,7 +61,6 @@
return
if(!W.tool_start_check(user, amount=1))
return
LAZYADD(repairing_mobs, user)
user.balloon_alert_to_viewers("started welding [src]", "started repairing [src]")
audible_message(span_hear("You hear welding."))
var/did_the_thing
@@ -78,7 +75,6 @@
user.balloon_alert_to_viewers("[(atom_integrity >= max_integrity) ? "fully" : "partially"] repaired [src]")
else
user.balloon_alert_to_viewers("stopped welding [src]", "interrupted the repair!")
LAZYREMOVE(repairing_mobs, user)
/obj/vehicle/sealed/car/vim/mob_enter(mob/newoccupant, silent = FALSE)
. = ..()
code/modules/vehicles/mecha/_mecha.dm
-2
View File
@@ -71,8 +71,6 @@
var/allow_diagonal_movement = FALSE
///Whether or not the mech destroys walls by running into it.
var/bumpsmash = FALSE
///What mobs are currently repairing us.
var/list/mob/living/repairing_mobs
///////////ATMOS
///Whether we are currrently drawing from the internal tank
code/modules/vehicles/mecha/mecha_defense.dm
+2 -4
View File
@@ -318,15 +318,14 @@
if(user.combat_mode)
return
. = TRUE
if(LAZYFIND(repairing_mobs, user))
balloon_alert(user, "you're already repairing it!")
if(DOING_INTERACTION(user, src))
balloon_alert(user, "you're already repairing this!")
return
if(atom_integrity >= max_integrity)
balloon_alert(user, "it's not damaged!")
return
if(!W.tool_start_check(user, amount=1))
return
LAZYADD(repairing_mobs, user)
user.balloon_alert_to_viewers("started welding [src]", "started repairing [src]")
audible_message(span_hear("You hear welding."))
var/did_the_thing
@@ -341,7 +340,6 @@
user.balloon_alert_to_viewers("[(atom_integrity >= max_integrity) ? "fully" : "partially"] repaired [src]")
else
user.balloon_alert_to_viewers("stopped welding [src]", "interrupted the repair!")
LAZYREMOVE(repairing_mobs, user)
/obj/vehicle/sealed/mecha/proc/full_repair(charge_cell)
code/modules/vehicles/secway.dm
+1 -5
View File
@@ -7,8 +7,6 @@
armor = list(MELEE = 10, BULLET = 0, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 60, ACID = 60)
key_type = /obj/item/key/security
integrity_failure = 0.5
///What mobs are currently repairing us.
var/list/mob/living/repairing_mobs
///This stores a banana that, when used on the secway, prevents the vehicle from moving until it is removed.
var/obj/item/food/grown/banana/eddie_murphy
@@ -34,7 +32,7 @@
if(user.combat_mode)
return
. = TRUE
if(LAZYFIND(repairing_mobs, user))
if(DOING_INTERACTION(user, src))
balloon_alert(user, "you're already repairing it!")
return
if(atom_integrity >= max_integrity)
@@ -42,7 +40,6 @@
return
if(!W.tool_start_check(user, amount=1))
return
LAZYADD(repairing_mobs, user)
user.balloon_alert_to_viewers("started welding [src]", "started repairing [src]")
audible_message(span_hear("You hear welding."))
var/did_the_thing
@@ -57,7 +54,6 @@
user.balloon_alert_to_viewers("[(atom_integrity >= max_integrity) ? "fully" : "partially"] repaired [src]")
else
user.balloon_alert_to_viewers("stopped welding [src]", "interrupted the repair!")
LAZYREMOVE(repairing_mobs, user)
/obj/vehicle/ridden/secway/attackby(obj/item/W, mob/living/user, params)
if(!istype(W, /obj/item/food/grown/banana))