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

Ports event system from Bay

Browse Source
This commit is contained in:
Yoshax
2016-06-01 22:05:04 +01:00
parent 2c95126a00
commit f75d509e7f
51 changed files with 814 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system.dm
-4
View File
@@ -107,9 +107,6 @@ steam.start() -- spawns the effect
var/turf/T = src.loc
if (istype(T, /turf))
T.hotspot_expose(1000,100)
spawn (20)
qdel(src)
return
/obj/effect/effect/sparks/Destroy()
var/turf/T = src.loc
@@ -185,7 +182,6 @@ steam.start() -- spawns the effect
..()
spawn (time_to_live)
qdel(src)
return
/obj/effect/effect/smoke/Crossed(mob/living/carbon/M as mob )
..()
code/game/objects/effects/landmarks.dm
+45 -34
View File
@@ -5,6 +5,7 @@
anchored = 1.0
unacidable = 1
simulated = 0
var/delete_me = 0
/obj/effect/landmark/New()
..()
@@ -14,33 +15,35 @@
switch(name) //some of these are probably obsolete
if("monkey")
monkeystart += loc
qdel(src)
delete_me = 1
return
if("start")
newplayer_start += loc
qdel(src)
delete_me = 1
return
if("JoinLate")
latejoin += loc
qdel(src)
delete_me = 1
return
if("JoinLateGateway")
latejoin_gateway += loc
qdel(src)
delete_me = 1
return
if("JoinLateElevator")
latejoin_elevator += loc
qdel(src)
delete_me = 1
return
if("JoinLateCryo")
latejoin_cryo += loc
qdel(src)
delete_me = 1
return
if("JoinLateCyborg")
latejoin_cyborg += loc
qdel(src)
delete_me = 1
return
if("prisonwarp")
prisonwarp += loc
qdel(src)
delete_me = 1
return
if("Holding Facility")
holdingfacility += loc
@@ -54,28 +57,36 @@
tdomeobserve += loc
if("prisonsecuritywarp")
prisonsecuritywarp += loc
qdel(src)
delete_me = 1
return
if("blobstart")
blobstart += loc
qdel(src)
delete_me = 1
return
if("xeno_spawn")
xeno_spawn += loc
qdel(src)
delete_me = 1
return
if("endgame_exit")
endgame_safespawns += loc
qdel(src)
delete_me = 1
return
if("bluespacerift")
endgame_exits += loc
qdel(src)
delete_me = 1
return
landmarks_list += src
return 1
/obj/effect/landmark/proc/delete()
delete_me = 1
/obj/effect/landmark/initialize()
..()
if(delete_me)
qdel(src)
/obj/effect/landmark/Destroy()
landmarks_list -= src
return ..()
@@ -99,14 +110,14 @@
var/list/options = typesof(/obj/effect/landmark/costume)
var/PICK= options[rand(1,options.len)]
new PICK(src.loc)
qdel(src)
delete_me = 1
//SUBCLASSES. Spawn a bunch of items and disappear likewise
/obj/effect/landmark/costume/chicken/New()
new /obj/item/clothing/suit/chickensuit(src.loc)
new /obj/item/clothing/head/chicken(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/gladiator/New()
new /obj/item/clothing/under/gladiator(src.loc)
@@ -118,32 +129,32 @@
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc)
new /obj/item/clothing/glasses/gglasses(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/elpresidente/New()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc)
new /obj/item/clothing/shoes/jackboots(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/nyangirl/New()
new /obj/item/clothing/under/schoolgirl(src.loc)
new /obj/item/clothing/head/kitty(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/maid/New()
new /obj/item/clothing/under/skirt(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/butler/New()
new /obj/item/clothing/suit/wcoat(src.loc)
new /obj/item/clothing/under/suit_jacket(src.loc)
new /obj/item/clothing/head/that(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/scratch/New()
new /obj/item/clothing/gloves/white(src.loc)
@@ -151,12 +162,12 @@
new /obj/item/clothing/under/scratch(src.loc)
if (prob(30))
new /obj/item/clothing/head/cueball(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/highlander/New()
new /obj/item/clothing/under/kilt(src.loc)
new /obj/item/clothing/head/beret(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/prig/New()
new /obj/item/clothing/suit/wcoat(src.loc)
@@ -167,24 +178,24 @@
new /obj/item/weapon/cane(src.loc)
new /obj/item/clothing/under/sl_suit(src.loc)
new /obj/item/clothing/mask/fakemoustache(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/plaguedoctor/New()
new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
new /obj/item/clothing/head/plaguedoctorhat(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/nightowl/New()
new /obj/item/clothing/under/owl(src.loc)
new /obj/item/clothing/mask/gas/owl_mask(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/waiter/New()
new /obj/item/clothing/under/waiter(src.loc)
var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
new CHOICE(src.loc)
new /obj/item/clothing/suit/apron(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/pirate/New()
new /obj/item/clothing/under/pirate(src.loc)
@@ -192,18 +203,18 @@
var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/eyepatch(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/commie/New()
new /obj/item/clothing/under/soviet(src.loc)
new /obj/item/clothing/head/ushanka(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/imperium_monk/New()
new /obj/item/clothing/suit/imperium_monk(src.loc)
if (prob(25))
new /obj/item/clothing/mask/gas/cyborg(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/holiday_priest/New()
new /obj/item/clothing/suit/holidaypriest(src.loc)
@@ -212,26 +223,26 @@
/obj/effect/landmark/costume/marisawizard/fake/New()
new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/cutewitch/New()
new /obj/item/clothing/under/sundress(src.loc)
new /obj/item/clothing/head/witchwig(src.loc)
new /obj/item/weapon/staff/broom(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/fakewizard/New()
new /obj/item/clothing/suit/wizrobe/fake(src.loc)
new /obj/item/clothing/head/wizard/fake(src.loc)
new /obj/item/weapon/staff/(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/sexyclown/New()
new /obj/item/clothing/mask/gas/sexyclown(src.loc)
new /obj/item/clothing/under/sexyclown(src.loc)
qdel(src)
delete_me = 1
/obj/effect/landmark/costume/sexymime/New()
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
qdel(src)
delete_me = 1
code/game/objects/items/devices/radio/encryptionkey.dm
-3
View File
@@ -12,9 +12,6 @@
var/syndie = 0
var/list/channels = list()
/obj/item/device/encryptionkey/New()
/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/device/encryptionkey/syndicate
code/game/objects/items/weapons/extinguisher.dm
+1
View File
@@ -37,6 +37,7 @@
/obj/item/weapon/extinguisher/New()
create_reagents(max_water)
reagents.add_reagent("water", max_water)
..()
/obj/item/weapon/extinguisher/examine(mob/user)
if(..(user, 0))
code/game/objects/items/weapons/tools.dm
+4 -3
View File
@@ -79,7 +79,7 @@
if (prob(75))
src.pixel_y = rand(0, 16)
return
..()
/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M) || user.a_intent == "help")
@@ -114,6 +114,7 @@
if(prob(50))
icon_state = "cutters-y"
item_state = "cutters_yellow"
..()
/obj/item/weapon/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob)
if(user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/weapon/handcuffs/cable)))
@@ -162,12 +163,12 @@
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
return
..()
/obj/item/weapon/weldingtool/Destroy()
if(welding)
processing_objects -= src
..()
return ..()
/obj/item/weapon/weldingtool/examine(mob/user)
if(..(user, 0))
code/game/objects/random/random.dm
+3 -1
View File
@@ -11,8 +11,10 @@
..()
if (!prob(spawn_nothing_percentage))
spawn_item()
qdel(src)
/obj/random/initialize()
..()
qdel(src)
// this function should return a specific item to spawn
/obj/random/proc/item_to_spawn()
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+1 -12
View File
@@ -22,7 +22,7 @@
/obj/structure/closet/emcloset/New()
..()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
if ("small")
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/weapon/tank/emergency_oxygen(src)
@@ -51,17 +51,6 @@
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
if ("nothing")
// doot
// teehee - Ah, tg coders...
if ("delete")
qdel(src)
//If you want to re-add fire, just add "fire" = 15 to the pick list.
/*if ("fire")
new /obj/structure/closet/firecloset(src.loc)
qdel(src)*/
/obj/structure/closet/emcloset/legacy/New()
..()
code/game/objects/structures/lattice.dm
+1 -1
View File
@@ -9,7 +9,7 @@
layer = 2.3 //under pipes
// flags = CONDUCT
/obj/structure/lattice/New() //turf/simulated/floor/asteroid
/obj/structure/lattice/initialize()
..()
if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
code/game/objects/structures/mop_bucket.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/structure/mopbucket/New()
create_reagents(100)
..()
/obj/structure/mopbucket/examine(mob/user)
if(..(user, 1))