Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes initialize hints on a lot of objects, optimizes effects, city structures load immediatelly upon mapload, Fixes some cases where template_noop should be used #2608

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes initialize hints on a lot of objects, optimizes effects, city structures load immediatelly upon mapload, Fixes some cases where template_noop should be used #2608

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf547a1
pain
Gboster-0 Dec 13, 2024
a3e086a
removes dis TG change
Gboster-0 Dec 13, 2024
4faf355
fixes gibspawners
Gboster-0 Dec 14, 2024
5e67eb5
back with 15 minutes
Gboster-0 Dec 16, 2024
01b52e9
fixes the R-corp peen sense rangefinder name breaking an init hint
Gboster-0 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...streets/random_rooms/bigrooms/bossroom.dm → ...station/random_rooms/bigrooms/bossroom.dm
View file
Open in desktop
File renamed without changes.
0 ...treets/random_rooms/bigrooms/connector.dm → ...tation/random_rooms/bigrooms/connector.dm
View file
Open in desktop
File renamed without changes.
0 .../random_rooms/bigrooms/pointofinterest.dm → .../random_rooms/bigrooms/pointofinterest.dm
View file
Open in desktop
File renamed without changes.
0 ...s/backstreets/random_rooms/large/north.dm → ...arTegustation/random_rooms/large/north.dm
View file
Open in desktop
File renamed without changes.
0 ...s/backstreets/random_rooms/large/south.dm → ...arTegustation/random_rooms/large/south.dm
View file
Open in desktop
File renamed without changes.
0 ...s/backstreets/random_rooms/medium/east.dm → ...arTegustation/random_rooms/medium/east.dm
View file
Open in desktop
File renamed without changes.
0 .../backstreets/random_rooms/medium/north.dm → ...rTegustation/random_rooms/medium/north.dm
View file
Open in desktop
File renamed without changes.
0 .../backstreets/random_rooms/medium/south.dm → ...rTegustation/random_rooms/medium/south.dm
View file
Open in desktop
File renamed without changes.
0 ...s/backstreets/random_rooms/medium/west.dm → ...arTegustation/random_rooms/medium/west.dm
View file
Open in desktop
File renamed without changes.
0 ...ms/backstreets/random_rooms/small/east.dm → ...larTegustation/random_rooms/small/east.dm
View file
Open in desktop
File renamed without changes.
0 ...s/backstreets/random_rooms/small/north.dm → ...arTegustation/random_rooms/small/north.dm
View file
Open in desktop
File renamed without changes.
0 ...s/backstreets/random_rooms/small/south.dm → ...arTegustation/random_rooms/small/south.dm
View file
Open in desktop
File renamed without changes.
0 ...ms/backstreets/random_rooms/small/west.dm → ...larTegustation/random_rooms/small/west.dm
View file
Open in desktop
File renamed without changes.
0 ...ation/tegu_items/backstreets/templates.dm → ModularTegustation/random_rooms/templates.dm
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ModularTegustation/tegu_items/associations/machines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@
resistance_flags = INDESTRUCTIBLE

/obj/structure/timelock/Initialize()
..()
addtimer(CALLBACK(src, PROC_REF(die)), 15 MINUTES)
addtimer(CALLBACK(src, PROC_REF(die)), 5 MINUTES) // NOW!!
Gboster-0 marked this conversation as resolved.
Show resolved Hide resolved
return ..()

/obj/structure/timelock/proc/die()
qdel(src)
Expand Down
3 changes: 1 addition & 2 deletions ModularTegustation/tegu_items/workshop/_materials.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
else
new resource_type(get_turf(user))
qdel(src)
return

/obj/item/tresmetal/proc/SetQuality(value)
if(!value)
Expand Down Expand Up @@ -69,7 +68,7 @@

/obj/item/hot_tresmetal/Initialize()
cool_timer = addtimer(CALLBACK(src, PROC_REF(cooling)), 5 MINUTES, TIMER_STOPPABLE)
..()
. = ..()
name = "heated " + initial(original_mat.name)
desc += " Put it on an anvil and hit with a hammer to work it."

Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRooms/backstreets/bossroom/robot.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
/turf/open/floor/engine,
/area/city/backstreets_room)
"PH" = (
/turf/closed/indestructible/rock,
/area/city/backstreets_room)
/turf/template_noop,
/area/template_noop)
"Rh" = (
/obj/effect/turf_decal{
dir = 8
Expand Down
109 changes: 56 additions & 53 deletions _maps/RandomRooms/backstreets/connector/choke_point.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
},
/turf/open/floor/plating/asteroid/basalt,
/area/city/backstreets_room)
"g" = (
/turf/template_noop,
/area/template_noop)
"h" = (
/obj/item/folder/documents,
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
Expand All @@ -28,8 +31,8 @@
/turf/closed/indestructible/reinforced,
/area/city/backstreets_room)
"o" = (
/turf/open/space/basic,
/area/city/backstreets_room)
/turf/open/floor/plating/asteroid/basalt,
/area/template_noop)
"p" = (
/obj/structure/sign/poster/official/cohiba_robusto_ad,
/turf/closed/indestructible/reinforced,
Expand Down Expand Up @@ -94,10 +97,10 @@ a
Q
a
a
a
a
a
a
g
g
g
g
a
"}
(3,1,1) = {"
Expand All @@ -110,11 +113,11 @@ a
F
W
a
a
a
a
a
a
g
g
g
g
g
a
"}
(4,1,1) = {"
Expand All @@ -127,11 +130,11 @@ o
a
Q
a
a
a
a
a
a
g
g
g
g
g
a
"}
(5,1,1) = {"
Expand All @@ -145,9 +148,9 @@ a
Q
a
a
a
a
a
g
g
g
a
a
"}
Expand Down Expand Up @@ -205,69 +208,69 @@ Q
(9,1,1) = {"
a
a
a
a
a
g
g
g
a
a
Q
a
a
a
a
a
g
g
g
a
a
"}
(10,1,1) = {"
a
a
a
a
a
a
g
g
g
g
g
a
W
m
a
a
a
a
a
g
g
g
g
g
a
"}
(11,1,1) = {"
a
a
a
a
a
a
g
g
g
g
g
a
W
a
a
a
a
a
a
g
g
g
g
g
a
"}
(12,1,1) = {"
a
a
a
a
a
g
g
g
g
a
a
Q
a
a
a
a
a
a
g
g
g
g
a
"}
(13,1,1) = {"
Expand Down
63 changes: 33 additions & 30 deletions _maps/RandomRooms/backstreets/connector/mountain_ca.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@
},
/turf/open/floor/plating/dirt/jungle/dark,
/area/city/backstreets_room)
"sU" = (
/turf/template_noop,
/area/template_noop)
"tk" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -613,8 +616,8 @@
/area/city/backstreets_room)

(1,1,1) = {"
XA
XA
sU
dA
dA
dA
dA
Expand All @@ -625,12 +628,12 @@ VO
dA
dA
dA
XA
XA
XA
sU
sU
sU
"}
(2,1,1) = {"
XA
dA
dA
fB
zf
Expand All @@ -642,9 +645,9 @@ hV
yf
dA
dA
XA
XA
XA
dA
sU
sU
"}
(3,1,1) = {"
dA
Expand All @@ -660,8 +663,8 @@ XV
Rd
yo
dA
XA
XA
dA
sU
"}
(4,1,1) = {"
dA
Expand All @@ -678,7 +681,7 @@ XV
Rd
gN
dA
XA
sU
"}
(5,1,1) = {"
dA
Expand All @@ -695,7 +698,7 @@ XV
Rd
XV
dA
XA
sU
"}
(6,1,1) = {"
dA
Expand All @@ -712,10 +715,10 @@ XV
XV
VL
dA
XA
sU
"}
(7,1,1) = {"
XA
dA
dA
Qf
XV
Expand All @@ -729,10 +732,10 @@ Rd
XV
nw
eM
XA
dA
"}
(8,1,1) = {"
XA
sU
dA
XV
mV
Expand All @@ -749,7 +752,7 @@ Tt
dA
"}
(9,1,1) = {"
XA
sU
dA
XV
kv
Expand All @@ -766,7 +769,7 @@ ih
eM
"}
(10,1,1) = {"
XA
sU
dA
yf
sv
Expand All @@ -783,8 +786,8 @@ LV
dA
"}
(11,1,1) = {"
XA
XA
sU
dA
dA
Bo
XV
Expand All @@ -800,9 +803,9 @@ mr
dA
"}
(12,1,1) = {"
XA
XA
XA
sU
sU
dA
dA
XV
mr
Expand All @@ -814,12 +817,12 @@ Rd
Rd
MH
dA
XA
dA
"}
(13,1,1) = {"
XA
XA
XA
sU
sU
sU
dA
dA
eM
Expand All @@ -830,6 +833,6 @@ dA
dA
dA
dA
XA
XA
dA
sU
"}
Loading
Loading