April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -4,15 +4,15 @@
|
||||
icon_state = "bicycle"
|
||||
var/easter_egg_chance = 1
|
||||
|
||||
var/static/list/bike_music = list('sound/misc/bike1.mid',
|
||||
'sound/misc/bike2.mid',
|
||||
'sound/misc/bike3.mid')
|
||||
var/static/list/bike_music = list('sound/misc/bike1.mid',
|
||||
'sound/misc/bike2.mid',
|
||||
'sound/misc/bike3.mid')
|
||||
/obj/vehicle/bicycle/New()
|
||||
..()
|
||||
riding_datum = new/datum/riding/bicycle
|
||||
|
||||
/obj/vehicle/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1)
|
||||
if(prob(easter_egg_chance) || (SSevent.holidays && SSevent.holidays[APRIL_FOOLS]))
|
||||
if(prob(easter_egg_chance) || (SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
|
||||
M << sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = 42)
|
||||
. = ..()
|
||||
|
||||
|
||||
@@ -5,13 +5,17 @@
|
||||
icon_state = "pussywagon"
|
||||
|
||||
var/obj/item/weapon/storage/bag/trash/mybag = null
|
||||
var/floorbuffer = 0
|
||||
var/floorbuffer = FALSE
|
||||
|
||||
/obj/vehicle/janicart/Initialize(mapload)
|
||||
..()
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/janicart/Destroy()
|
||||
if(mybag)
|
||||
qdel(mybag)
|
||||
mybag = null
|
||||
return ..()
|
||||
. = ..()
|
||||
|
||||
/obj/vehicle/janicart/buckle_mob(mob/living/buckled_mob, force = 0, check_loc = 0)
|
||||
. = ..()
|
||||
@@ -32,17 +36,6 @@
|
||||
origin_tech = "materials=3;engineering=4"
|
||||
|
||||
|
||||
/obj/vehicle/janicart/Moved(atom/OldLoc, Dir)
|
||||
if(floorbuffer)
|
||||
var/turf/tile = loc
|
||||
if(isturf(tile))
|
||||
tile.clean_blood()
|
||||
for(var/A in tile)
|
||||
if(is_cleanable(A))
|
||||
qdel(A)
|
||||
. = ..()
|
||||
|
||||
|
||||
/obj/vehicle/janicart/examine(mob/user)
|
||||
..()
|
||||
if(floorbuffer)
|
||||
@@ -56,14 +49,18 @@
|
||||
return
|
||||
if(!user.drop_item())
|
||||
return
|
||||
to_chat(user, "<span class='notice'>You hook the trashbag onto \the [name].</span>")
|
||||
to_chat(user, "<span class='notice'>You hook the trashbag onto [src].</span>")
|
||||
I.loc = src
|
||||
mybag = I
|
||||
update_icon()
|
||||
else if(istype(I, /obj/item/janiupgrade))
|
||||
floorbuffer = 1
|
||||
if(floorbuffer)
|
||||
to_chat(user, "<span class='warning'>[src] already has a floor buffer!</span>")
|
||||
return
|
||||
floorbuffer = TRUE
|
||||
qdel(I)
|
||||
to_chat(user, "<span class='notice'>You upgrade \the [name] with the floor buffer.</span>")
|
||||
to_chat(user, "<span class='notice'>You upgrade [src] with the floor buffer.</span>")
|
||||
flags |= CLEAN_ON_MOVE
|
||||
update_icon()
|
||||
else
|
||||
return ..()
|
||||
@@ -84,4 +81,7 @@
|
||||
mybag.loc = get_turf(user)
|
||||
user.put_in_hands(mybag)
|
||||
mybag = null
|
||||
update_icon()
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/janicart/upgraded
|
||||
floorbuffer = TRUE
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
..()
|
||||
if(A.density && has_buckled_mobs())
|
||||
var/mob/living/carbon/H = buckled_mobs[1]
|
||||
var/atom/throw_target = get_edge_target_turf(H, pick(cardinal))
|
||||
var/atom/throw_target = get_edge_target_turf(H, pick(GLOB.cardinal))
|
||||
unbuckle_mob(H)
|
||||
H.throw_at(throw_target, 4, 3)
|
||||
H.Weaken(5)
|
||||
|
||||
@@ -76,4 +76,4 @@
|
||||
if(src.has_buckled_mobs())
|
||||
for(var/atom/A in range(2, src))
|
||||
if(!(A in src.buckled_mobs))
|
||||
Bump(A)
|
||||
Bump(A)
|
||||
|
||||
Reference in New Issue
Block a user