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

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/meteor/meteor.dm
+8 -6
View File
@@ -6,18 +6,20 @@
var/rampupdelta = 5
required_players = 0
announce_span = "danger"
announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
/datum/game_mode/meteor/announce()
world << "<B>The current game mode is - Meteor!</B>"
world << "<B>The space station has been stuck in a major meteor shower. You must escape from the station or at least live.</B>"
/datum/game_mode/meteor/process()
if(nometeors || meteordelay > world.time - round_start_time)
if(nometeors || meteordelay > world.time - round_start_time)
return
var/list/wavetype = meteors_normal
var/meteorminutes = (world.time - round_start_time - meteordelay) / 10 / 60
if (prob(meteorminutes))
wavetype = meteors_threatening
code/game/gamemodes/meteor/meteors.dm
+48 -77
View File
@@ -1,4 +1,3 @@
#define DEFAULT_METEOR_LIFETIME 1800
/var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds
//set to at least 100 unless you want evarr ruining every round
@@ -29,7 +28,7 @@
var/turf/pickedstart
var/turf/pickedgoal
var/max_i = 10//number of tries to spawn meteor.
while(!isspaceturf(pickedstart))
while (!istype(pickedstart, /turf/open/space))
var/startSide = pick(cardinal)
pickedstart = spaceDebrisStartLoc(startSide, 1)
pickedgoal = spaceDebrisFinishLoc(startSide, 1)
@@ -42,42 +41,45 @@
M.z_original = 1
spawn(0)
walk_towards(M, M.dest, 1)
return
/proc/spaceDebrisStartLoc(startSide, Z)
var/starty
var/startx
switch(startSide)
if(NORTH)
if(1) //NORTH
starty = world.maxy-(TRANSITIONEDGE+1)
startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
if(EAST)
if(2) //EAST
starty = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
startx = world.maxx-(TRANSITIONEDGE+1)
if(SOUTH)
if(3) //SOUTH
starty = (TRANSITIONEDGE+1)
startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
if(WEST)
if(4) //WEST
starty = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
startx = (TRANSITIONEDGE+1)
. = locate(startx, starty, Z)
var/turf/T = locate(startx, starty, Z)
return T
/proc/spaceDebrisFinishLoc(startSide, Z)
var/endy
var/endx
switch(startSide)
if(NORTH)
endy = (TRANSITIONEDGE+1)
endx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
if(EAST)
endy = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
endx = (TRANSITIONEDGE+1)
if(SOUTH)
endy = world.maxy-(TRANSITIONEDGE+1)
endx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
if(WEST)
endy = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
endx = world.maxx-(TRANSITIONEDGE+1)
. = locate(endx, endy, Z)
if(1) //NORTH
endy = TRANSITIONEDGE
endx = rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE)
if(2) //EAST
endy = rand(TRANSITIONEDGE, world.maxy-TRANSITIONEDGE)
endx = TRANSITIONEDGE
if(3) //SOUTH
endy = world.maxy-TRANSITIONEDGE
endx = rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE)
if(4) //WEST
endy = rand(TRANSITIONEDGE,world.maxy-TRANSITIONEDGE)
endx = world.maxx-TRANSITIONEDGE
var/turf/T = locate(endx, endy, Z)
return T
///////////////////////
//The meteor effect
@@ -97,8 +99,6 @@
var/heavy = 0
var/meteorsound = 'sound/effects/meteorimpact.ogg'
var/z_original = 1
var/threat = 0 // used for determining which meteors are most interesting
var/lifetime = DEFAULT_METEOR_LIFETIME
var/list/meteordrop = list(/obj/item/weapon/ore/iron)
var/dropamt = 2
@@ -114,21 +114,18 @@
var/turf/T = get_turf(loc)
ram_turf(T)
if(prob(10) && !isspaceturf(T))//randomly takes a 'hit' from ramming
if(prob(10) && !istype(T, /turf/open/space))//randomly takes a 'hit' from ramming
get_hit()
return .
/obj/effect/meteor/Destroy()
meteor_list -= src
walk(src,0) //this cancels the walk_towards() proc
. = ..()
return ..()
/obj/effect/meteor/New()
..()
meteor_list += src
if(SSaugury)
SSaugury.register_doom(src, threat)
SpinAnimation()
QDEL_IN(src, lifetime)
/obj/effect/meteor/Bump(atom/A)
if(A)
@@ -140,7 +137,7 @@
//first bust whatever is in the turf
for(var/atom/A in T)
if(A != src)
if(isliving(A))
if(istype(A, /mob/living))
A.visible_message("<span class='warning'>[src] slams into [A].</span>", "<span class='userdanger'>[src] slams into you!.</span>")
A.ex_act(hitpwr)
@@ -156,38 +153,28 @@
hits--
if(hits <= 0)
make_debris()
meteor_effect()
meteor_effect(heavy)
qdel(src)
/obj/effect/meteor/ex_act()
return
#define METEOR_MEDAL "Your Life Before Your Eyes"
/obj/effect/meteor/examine(mob/user)
if(!admin_spawned && isliving(user))
UnlockMedal(METEOR_MEDAL,user.client)
..()
#undef METEOR_MEDAL
/obj/effect/meteor/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/pickaxe))
make_debris()
qdel(src)
return
else
. = ..()
return ..()
/obj/effect/meteor/proc/make_debris()
for(var/throws = dropamt, throws > 0, throws--)
var/thing_to_spawn = pick(meteordrop)
new thing_to_spawn(get_turf(src))
/obj/effect/meteor/proc/meteor_effect()
if(heavy)
/obj/effect/meteor/proc/meteor_effect(sound=1)
if(sound)
for(var/mob/M in player_list)
if((M.orbiting) && (SSaugury.watchers[M]))
continue
var/turf/T = get_turf(M)
if(!T || T.z != src.z)
continue
@@ -208,16 +195,14 @@
hitpwr = 3
meteorsound = 'sound/weapons/Gunshot_smg.ogg'
meteordrop = list(/obj/item/weapon/ore/glass)
threat = 1
//Medium-sized
/obj/effect/meteor/medium
name = "meteor"
dropamt = 3
threat = 5
/obj/effect/meteor/medium/meteor_effect()
..()
..(heavy)
explosion(src.loc, 0, 1, 2, 3, 0)
//Large-sized
@@ -227,10 +212,9 @@
hits = 6
heavy = 1
dropamt = 4
threat = 10
/obj/effect/meteor/big/meteor_effect()
..()
..(heavy)
explosion(src.loc, 1, 2, 3, 4, 0)
//Flaming meteor
@@ -241,10 +225,9 @@
heavy = 1
meteorsound = 'sound/effects/bamf.ogg'
meteordrop = list(/obj/item/weapon/ore/plasma)
threat = 20
/obj/effect/meteor/flaming/meteor_effect()
..()
..(heavy)
explosion(src.loc, 1, 2, 3, 4, 0, 0, 5)
//Radiation meteor
@@ -253,11 +236,10 @@
icon_state = "glowing"
heavy = 1
meteordrop = list(/obj/item/weapon/ore/uranium)
threat = 15
/obj/effect/meteor/irradiated/meteor_effect()
..()
..(heavy)
explosion(src.loc, 0, 0, 4, 3, 0)
new /obj/effect/decal/cleanable/greenglow(get_turf(src))
radiation_pulse(get_turf(src), 2, 5, 50, 1)
@@ -272,18 +254,15 @@
meteorsound = 'sound/effects/blobattack.ogg'
meteordrop = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human, /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
var/meteorgibs = /obj/effect/gibspawner/generic
threat = 2
/obj/effect/meteor/meaty/New()
for(var/path in meteordrop)
if(path == /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant)
meteordrop -= path
meteordrop += pick(subtypesof(path))
for(var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/M in meteordrop)
meteordrop -= M
meteordrop += pick(subtypesof(M))
for(var/path in meteordrop)
if(path == /obj/item/organ/tongue)
meteordrop -= path
meteordrop += pick(typesof(path))
for(var/obj/item/organ/tongue/T in meteordrop)
meteordrop -= T
meteordrop += pick(typesof(T))
..()
/obj/effect/meteor/meaty/make_debris()
@@ -292,8 +271,8 @@
/obj/effect/meteor/meaty/ram_turf(turf/T)
if(!isspaceturf(T))
new /obj/effect/decal/cleanable/blood(T)
if(!istype(T, /turf/open/space))
new /obj/effect/decal/cleanable/blood (T)
/obj/effect/meteor/meaty/Bump(atom/A)
A.ex_act(hitpwr)
@@ -310,28 +289,22 @@
..()
/obj/effect/meteor/meaty/xeno/ram_turf(turf/T)
if(!isspaceturf(T))
new /obj/effect/decal/cleanable/xenoblood(T)
if(!istype(T, /turf/open/space))
new /obj/effect/decal/cleanable/xenoblood (T)
//Station buster Tunguska
/obj/effect/meteor/tunguska
name = "tunguska meteor"
icon_state = "flaming"
desc = "Your life briefly passes before your eyes the moment you lay them on this monstrosity."
desc = "Your life briefly passes before your eyes the moment you lay them on this monstruosity"
hits = 30
hitpwr = 1
heavy = 1
meteorsound = 'sound/effects/bamf.ogg'
meteordrop = list(/obj/item/weapon/ore/plasma)
threat = 50
/obj/effect/meteor/tunguska/Move()
. = ..()
if(.)
PoolOrNew(/obj/effect/overlay/temp/revenant, get_turf(src))
/obj/effect/meteor/tunguska/meteor_effect()
..()
..(heavy)
explosion(src.loc, 5, 10, 15, 20, 0)
/obj/effect/meteor/tunguska/Bump()
@@ -354,10 +327,8 @@
heavy = 1
dropamt = 1
meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin)
threat = 100
/obj/effect/meteor/pumpkin/New()
..()
meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg')
//////////////////////////
#undef DEFAULT_METEOR_LIFETIME