Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
This commit is contained in:
Poojawa
@@ -36,7 +36,8 @@
|
||||
|
||||
/turf/closed/indestructible/splashscreen/Initialize()
|
||||
..()
|
||||
icon_state = pick("title1","title2","title3","title4","title5")
|
||||
if(titlescreen)
|
||||
icon_state = pick("title1","title2","title3","title4","title5")
|
||||
|
||||
/turf/closed/indestructible/riveted
|
||||
icon = 'icons/turf/walls/riveted.dmi'
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
wet = wet_setting
|
||||
if(wet_setting != TURF_DRY)
|
||||
if(wet_overlay)
|
||||
overlays -= wet_overlay
|
||||
cut_overlay(wet_overlay)
|
||||
wet_overlay = null
|
||||
var/turf/open/floor/F = src
|
||||
if(istype(F))
|
||||
@@ -212,7 +212,7 @@
|
||||
else
|
||||
wet = TURF_DRY
|
||||
if(wet_overlay)
|
||||
overlays -= wet_overlay
|
||||
cut_overlay(wet_overlay)
|
||||
|
||||
/turf/open/proc/HandleWet()
|
||||
if(!wet)
|
||||
|
||||
@@ -436,7 +436,7 @@
|
||||
|
||||
/turf/closed/mineral/gibtonite/proc/defuse()
|
||||
if(stage == 1)
|
||||
overlays -= activated_image
|
||||
cut_overlay(activated_image)
|
||||
var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = ON_EDGED_TURF_LAYER)
|
||||
add_overlay(I)
|
||||
desc = "An inactive gibtonite reserve. The ore can be extracted."
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
|
||||
explosion_block = 2
|
||||
hardness = 10
|
||||
slicing_duration = 120
|
||||
slicing_duration = 80
|
||||
sheet_type = /obj/item/stack/tile/brass
|
||||
sheet_amount = 1
|
||||
girder_type = /obj/structure/destructible/clockwork/wall_gear
|
||||
|
||||
@@ -206,7 +206,7 @@
|
||||
|
||||
|
||||
/turf/closed/wall/proc/thermitemelt(mob/user)
|
||||
overlays = list()
|
||||
cut_overlays()
|
||||
var/obj/effect/overlay/O = new/obj/effect/overlay( src )
|
||||
O.name = "thermite"
|
||||
O.desc = "Looks hot."
|
||||
|
||||
+11
-7
@@ -279,11 +279,13 @@
|
||||
usr << "<span class='notice'>You start dumping out the contents...</span>"
|
||||
if(!do_after(usr,20,target=src_object))
|
||||
return 0
|
||||
for(var/obj/item/I in src_object)
|
||||
if(user.s_active != src_object)
|
||||
if(I.on_found(user))
|
||||
return
|
||||
src_object.remove_from_storage(I, src) //No check needed, put everything inside
|
||||
|
||||
var/list/things = src_object.contents.Copy()
|
||||
var/datum/progressbar/progress = new(user, things.len, src)
|
||||
while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /obj/item/weapon/storage.proc/mass_remove_from_storage, src, things, progress)))
|
||||
sleep(1)
|
||||
qdel(progress)
|
||||
|
||||
return 1
|
||||
|
||||
//////////////////////////////
|
||||
@@ -384,6 +386,8 @@
|
||||
continue
|
||||
if(istype(A, /obj/docking_port))
|
||||
continue
|
||||
if(A == T0)
|
||||
continue
|
||||
qdel(A, force=TRUE)
|
||||
|
||||
T0.ChangeTurf(turf_type)
|
||||
@@ -457,5 +461,5 @@
|
||||
|
||||
/turf/proc/remove_decal(group)
|
||||
LAZYINITLIST(decals)
|
||||
overlays -= decals[group]
|
||||
decals[group] = null
|
||||
cut_overlay(decals[group])
|
||||
decals[group] = null
|
||||
Reference in New Issue
Block a user