shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/bicycle.dm
+30
View File
@@ -0,0 +1,30 @@
/obj/vehicle/bicycle
name = "bicycle"
desc = "Keep away from electricity."
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')
/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]))
M << sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = 42)
. = ..()
/obj/vehicle/bicycle/unbuckle_mob(mob/living/buckled_mob,force = 0)
if(buckled_mob)
buckled_mob << sound(null, repeat = 0, wait = 0, volume = 80, channel = 42)
. =..()
/obj/vehicle/bicycle/tesla_act() // :::^^^)))
name = "fried bicycle"
desc = "Well spent."
riding_datum = null
color = rgb(63, 23, 4)
for(var/m in buckled_mobs)
unbuckle_mob(m,1)
code/modules/vehicles/pimpin_ride.dm
+4 -4
View File
@@ -46,24 +46,24 @@
/obj/vehicle/janicart/examine(mob/user)
..()
if(floorbuffer)
user << "It has been upgraded with a floor buffer."
to_chat(user, "It has been upgraded with a floor buffer.")
/obj/vehicle/janicart/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/storage/bag/trash))
if(mybag)
user << "<span class='warning'>[src] already has a trashbag hooked!</span>"
to_chat(user, "<span class='warning'>[src] already has a trashbag hooked!</span>")
return
if(!user.drop_item())
return
user << "<span class='notice'>You hook the trashbag onto \the [name].</span>"
to_chat(user, "<span class='notice'>You hook the trashbag onto \the [name].</span>")
I.loc = src
mybag = I
update_icon()
else if(istype(I, /obj/item/janiupgrade))
floorbuffer = 1
qdel(I)
user << "<span class='notice'>You upgrade \the [name] with the floor buffer.</span>"
to_chat(user, "<span class='notice'>You upgrade \the [name] with the floor buffer.</span>")
update_icon()
else
return ..()
code/modules/vehicles/scooter.dm
+26 -15
View File
@@ -5,12 +5,16 @@
/obj/vehicle/scooter/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>You begin to remove the handlebars...</span>"
to_chat(user, "<span class='notice'>You begin to remove the handlebars...</span>")
playsound(get_turf(user), 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 40*I.toolspeed, target = src))
new /obj/vehicle/scooter/skateboard(get_turf(src))
var/obj/vehicle/scooter/skateboard/S = new /obj/vehicle/scooter/skateboard(get_turf(src))
new /obj/item/stack/rods(get_turf(src),2)
user << "<span class='notice'>You remove the handlebars from [src].</span>"
to_chat(user, "<span class='notice'>You remove the handlebars from [src].</span>")
if(has_buckled_mobs())
var/mob/living/carbon/H = buckled_mobs[1]
unbuckle_mob(H)
S.buckle_mob(H)
qdel(src)
@@ -19,7 +23,7 @@
if(!istype(M))
return 0
if(M.get_num_legs() < 2 && M.get_num_arms() <= 0)
M << "<span class='warning'>Your limbless body can't ride \the [src].</span>"
to_chat(M, "<span class='warning'>Your limbless body can't ride \the [src].</span>")
return 0
. = ..()
@@ -61,7 +65,7 @@
if(!istype(M) || M.incapacitated() || !Adjacent(M))
return
if(has_buckled_mobs() && over_object == M)
M << "<span class='warning'>You can't lift this up when somebody's on it.</span>"
to_chat(M, "<span class='warning'>You can't lift this up when somebody's on it.</span>")
return
if(over_object == M)
var/obj/item/weapon/melee/skateboard/board = new /obj/item/weapon/melee/skateboard()
@@ -78,7 +82,7 @@
/obj/item/scooter_frame/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>You deconstruct [src].</span>"
to_chat(user, "<span class='notice'>You deconstruct [src].</span>")
new /obj/item/stack/rods(get_turf(src),10)
playsound(get_turf(user), 'sound/items/Ratchet.ogg', 50, 1)
qdel(src)
@@ -87,37 +91,44 @@
else if(istype(I, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = I
if(M.get_amount() < 5)
user << "<span class='warning'>You need at least five metal sheets to make proper wheels!</span>"
to_chat(user, "<span class='warning'>You need at least five metal sheets to make proper wheels!</span>")
return
user << "<span class='notice'>You begin to add wheels to [src].</span>"
to_chat(user, "<span class='notice'>You begin to add wheels to [src].</span>")
if(do_after(user, 80, target = src))
if(!M || M.get_amount() < 5)
return
M.use(5)
user << "<span class='notice'>You finish making wheels for [src].</span>"
to_chat(user, "<span class='notice'>You finish making wheels for [src].</span>")
new /obj/vehicle/scooter/skateboard(user.loc)
qdel(src)
/obj/vehicle/scooter/skateboard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
user << "<span class='notice'>You begin to deconstruct and remove the wheels on [src]...</span>"
to_chat(user, "<span class='notice'>You begin to deconstruct and remove the wheels on [src]...</span>")
playsound(get_turf(user), I.usesound, 50, 1)
if(do_after(user, 20, target = src))
user << "<span class='notice'>You deconstruct the wheels on [src].</span>"
to_chat(user, "<span class='notice'>You deconstruct the wheels on [src].</span>")
new /obj/item/stack/sheet/metal(get_turf(src),5)
new /obj/item/scooter_frame(get_turf(src))
if(has_buckled_mobs())
var/mob/living/carbon/H = buckled_mobs[1]
unbuckle_mob(H)
qdel(src)
else if(istype(I, /obj/item/stack/rods))
var/obj/item/stack/rods/C = I
if(C.get_amount() < 2)
user << "<span class='warning'>You need at least two rods to make proper handlebars!</span>"
to_chat(user, "<span class='warning'>You need at least two rods to make proper handlebars!</span>")
return
user << "<span class='notice'>You begin making handlebars for [src].</span>"
to_chat(user, "<span class='notice'>You begin making handlebars for [src].</span>")
if(do_after(user, 25, target = src))
if(!C || C.get_amount() < 2)
return
user << "<span class='notice'>You add the rods to [src], creating handlebars.</span>"
to_chat(user, "<span class='notice'>You add the rods to [src], creating handlebars.</span>")
C.use(2)
new/obj/vehicle/scooter(get_turf(src))
var/obj/vehicle/scooter/S = new/obj/vehicle/scooter(get_turf(src))
if(has_buckled_mobs())
var/mob/living/carbon/H = buckled_mobs[1]
unbuckle_mob(H)
S.buckle_mob(H)
qdel(src)
code/modules/vehicles/speedbike.dm
+28 -11
View File
@@ -41,22 +41,39 @@
/obj/vehicle/space/speedbike/speedwagon
name = "BM Speedwagon"
desc = "Push it to the limit, walk along the razor's edge."
icon = 'icons/obj/bike.dmi'
icon = 'icons/obj/car.dmi'
icon_state = "speedwagon"
layer = LYING_MOB_LAYER
overlay_state = "speedwagon_cover"
var/crash_all = FALSE //CHAOS
pixel_y = -48 //to fix the offset when Initialized()
pixel_x = -48
/obj/vehicle/space/speedbike/speedwagon/Bump(mob/living/A)
/obj/vehicle/space/speedbike/speedwagon/Bump(atom/movable/A)
. = ..()
if(A.density && has_buckled_mobs() && (istype(A, /mob/living/carbon/human) && has_buckled_mobs()))
var/atom/throw_target = get_edge_target_turf(A, pick(cardinal))
A.throw_at(throw_target, 4, 3)
A.Weaken(5)
A.adjustStaminaLoss(30)
A.apply_damage(rand(20,35), BRUTE)
visible_message("<span class='danger'>[src] crashes into [A]!</span>")
playsound(src, 'sound/effects/bang.ogg', 50, 1)
if(A.density && has_buckled_mobs())
var/atom/throw_target = get_edge_target_turf(A, src.dir)
if(crash_all)
A.throw_at(throw_target, 4, 3)
visible_message("<span class='danger'>[src] crashes into [A]!</span>")
playsound(src, 'sound/effects/bang.ogg', 50, 1)
if(ishuman(A))
var/mob/living/carbon/human/H = A
H.Weaken(5)
H.adjustStaminaLoss(30)
H.apply_damage(rand(20,35), BRUTE)
if(!crash_all)
H.throw_at(throw_target, 4, 3)
visible_message("<span class='danger'>[src] crashes into [H]!</span>")
playsound(src, 'sound/effects/bang.ogg', 50, 1)
/obj/vehicle/space/speedbike/speedwagon/buckle_mob(mob/living/M, force = 0, check_loc = 1)
. = ..()
riding_datum = new/datum/riding/space/speedbike/speedwagon
riding_datum = new/datum/riding/space/speedwagon
/obj/vehicle/space/speedbike/speedwagon/Moved()
. = ..()
if(src.has_buckled_mobs())
for(var/atom/A in range(2, src))
if(!(A in src.buckled_mobs))
Bump(A)
code/modules/vehicles/vehicle.dm
+4 -4
View File
@@ -98,12 +98,12 @@
..()
if(!(resistance_flags & INDESTRUCTIBLE))
if(resistance_flags & ON_FIRE)
user << "<span class='warning'>It's on fire!</span>"
to_chat(user, "<span class='warning'>It's on fire!</span>")
var/healthpercent = (obj_integrity/max_integrity) * 100
switch(healthpercent)
if(50 to 99)
user << "It looks slightly damaged."
to_chat(user, "It looks slightly damaged.")
if(25 to 50)
user << "It appears heavily damaged."
to_chat(user, "It appears heavily damaged.")
if(0 to 25)
user << "<span class='warning'>It's falling apart!</span>"
to_chat(user, "<span class='warning'>It's falling apart!</span>")