From c833f9073b037104c48653a579167894b27f87e3 Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Sat, 28 Jan 2017 23:11:25 +0000 Subject: [PATCH 01/60] Fixes obj/randoms not functioning and moves them to initialize (#1647) --- code/game/objects/random/random.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 33ff2985545..6dacdd33cfd 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -7,13 +7,11 @@ // creates a new object and deletes itself -/obj/random/New() - ..() - if (!prob(spawn_nothing_percentage)) - spawn_item() /obj/random/initialize() ..() + if (!prob(spawn_nothing_percentage)) + spawn_item() qdel(src) // this function should return a specific item to spawn @@ -24,8 +22,7 @@ // creates the random item /obj/random/proc/spawn_item() var/build_path = item_to_spawn() - return (new build_path(src.loc)) - + new build_path(loc) /obj/random/single name = "randomly spawned object" From 061b946a3a302585d2405c959fb078c4230c5d5d Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 29 Jan 2017 10:27:48 -0200 Subject: [PATCH 02/60] Return of the mining loot crates and shuttle issues (#1654) - Fixes #1652 - Fixes #1641 -adds a small chance of not destroying artifacts when mining them with regular tools --- code/game/area/Space Station 13 areas.dm | 3 ++- code/modules/mining/mine_turfs.dm | 7 ++++++- html/changelogs/alberky-PR-387.yml | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberky-PR-387.yml diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 1b02442260a..34d1994b0e0 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -236,7 +236,6 @@ area/space/atmosalert() /area/shuttle/mining/outpost icon_state = "shuttle" - base_turf = /turf/simulated/floor/asteroid /area/shuttle/transport1/centcom icon_state = "shuttle" @@ -527,6 +526,7 @@ area/space/atmosalert() /area/syndicate_station/mining name = "\improper northeast of the mining station" icon_state = "north" + base_turf = /turf/space /area/syndicate_station/arrivals_dock name = "\improper docked with station" @@ -580,6 +580,7 @@ area/space/atmosalert() /area/skipjack_station/mining name = "\improper south of mining station" icon_state = "north" + base_turf = /turf/space //PRISON /area/prison diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 083e47fe724..32aeb2f6cf7 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -279,7 +279,8 @@ if(prob(50)) M.Stun(5) M.apply_effect(25, IRRADIATE) - + if(prob(3)) + excavate_find(prob(5), finds[1]) var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST) @@ -296,6 +297,10 @@ if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/mineral)) T.overlays += image('icons/turf/walls.dmi', "rock_side", dir = step_overlays[next_direction]) + if(rand(1,500) == 1) + visible_message("An old dusty crate was buried within!") + new /obj/structure/closet/crate/secure/loot(src) + if(istype(N)) N.overlay_detail = "asteroid[rand(0,9)]" N.updateMineralOverlays(1) diff --git a/html/changelogs/alberky-PR-387.yml b/html/changelogs/alberky-PR-387.yml new file mode 100644 index 00000000000..421beef0818 --- /dev/null +++ b/html/changelogs/alberky-PR-387.yml @@ -0,0 +1,6 @@ +author: Alberky + +delete-after: True + +changes: + - rscadd: "Re-added the loot crates to mining." From 2cb3bb1a78306b97c53bf22224673ff0f631ddc3 Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Sun, 29 Jan 2017 19:16:14 +0000 Subject: [PATCH 03/60] Lawgiver and random fix (#1658) Fixes an issue that popped up with obj/randoms, they werent getting sucked into lockers Also fixes that lawgiver runtime. The issue that previous fixes miss is that DM casts implicitly and without safety checks. Casting an animal to a human does not result in null. an istype check is needed --- code/game/objects/random/random.dm | 2 ++ code/game/objects/structures/crates_lockers/closets.dm | 3 ++- code/modules/projectiles/guns/energy/lawgiver.dm | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 6dacdd33cfd..8d2eeb4e4ec 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -21,6 +21,8 @@ // creates the random item /obj/random/proc/spawn_item() + + var/build_path = item_to_spawn() new build_path(loc) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index bc4e9d5f889..077ba16c813 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -27,8 +27,9 @@ /obj/structure/closet/initialize() ..() if(!opened) // if closed, any item at the crate's loc is put in the contents - var/obj/item/I + var/obj/I for(I in src.loc) + if (!istype(I, /obj/item) && !istype(I, /obj/random))continue if(I.density || I.anchored || I == src) continue I.forceMove(src) // adjust locker size to hold all items with 5 units of free store room diff --git a/code/modules/projectiles/guns/energy/lawgiver.dm b/code/modules/projectiles/guns/energy/lawgiver.dm index 4075cda9c42..d8d3d91e797 100644 --- a/code/modules/projectiles/guns/energy/lawgiver.dm +++ b/code/modules/projectiles/guns/energy/lawgiver.dm @@ -118,9 +118,9 @@ /obj/item/weapon/gun/energy/lawgiver/hear_talk(mob/living/M in range(0,src), msg) var/mob/living/carbon/human/H = M - if (!H) + if (!H || !istype(H)) return - if( (src.dna==usr.dna.unique_enzymes || emagged) && (src in usr.contents)) + if( (src.dna==H.dna.unique_enzymes || emagged) && (src in H.contents)) hear(msg) return From 48d5809592635903c7b295190292cd4aabc60afc Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 29 Jan 2017 15:11:56 -0500 Subject: [PATCH 04/60] Changelogs, 29JAN2017 --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/alberky-PR-387.yml | 6 ------ 3 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/alberky-PR-387.yml diff --git a/html/changelog.html b/html/changelog.html index e3830fb8c93..93bd15994c7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

29 January 2017

+

Alberky updated:

+
    +
  • Re-added the loot crates to mining.
  • +
+

25 January 2017

Skull132 updated: