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

[DRAFT] Art-Sci redux, monkecode edition #505

Merged
merged 82 commits into from
Nov 24, 2023
Merged

[DRAFT] Art-Sci redux, monkecode edition #505

Show file tree
Hide file tree
Changes from 73 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
3badc06
early port
dwasint Oct 27, 2023
5cf99f4
enables Irradiating trigger via radiation
dwasint Oct 27, 2023
e392da2
cleans linters
dwasint Oct 27, 2023
59f3eae
start of overrides
dwasint Oct 27, 2023
b97bd36
more overrides
dwasint Oct 27, 2023
5ca114c
Create _fault.dm
dwasint Oct 27, 2023
c82ac68
redoing of a vast majority of the original pr
dwasint Oct 29, 2023
76bdefa
my yeebe gleebe ass forgot it was the otherway
dwasint Oct 29, 2023
bc4eb3b
could have sworn i deleted the folder...
dwasint Oct 29, 2023
96cc48a
fixes how hint range works, and makes comments clearer. Also fixes ra…
dwasint Oct 29, 2023
d9261c5
forgor
dwasint Oct 29, 2023
4d8413e
adds procs for singularity rad output to give radiation to artifacts …
dwasint Oct 29, 2023
bc5966d
round this off in case we dont want a range one granted it will be in…
dwasint Oct 29, 2023
2b2ea9c
repulsor touch ups
dwasint Oct 29, 2023
a893d0c
makes vomit and repulsor auto disable after baseline * potency / 10
dwasint Oct 29, 2023
ec6cb76
spacers artifact ss, and moves the spawn_artifacts to the generic new…
dwasint Oct 29, 2023
58ec615
supports martian and precursor inside injector
dwasint Oct 29, 2023
39cc678
replaces the subsystem with a running global list. Changes rarity lis…
dwasint Oct 29, 2023
8c95b21
Update new_procs.dm
dwasint Oct 29, 2023
4e2ba31
Update new_procs.dm
dwasint Oct 29, 2023
02a70b7
i think this is better?
dwasint Oct 29, 2023
1eb8ced
Update new_procs.dm
dwasint Oct 29, 2023
e6dbe01
more cleanup moves globals to seperate file
dwasint Oct 29, 2023
36e0a24
adds our first fault
dwasint Oct 29, 2023
f8876a2
idk why i need as anything for subtypes of but i do.
dwasint Oct 29, 2023
32230eb
fixes runtimes makes faults work better
dwasint Oct 29, 2023
d435aa9
replaces the ever growing on_attackby signal with proc on item level …
dwasint Oct 30, 2023
fdf7fdd
replaces instances of arm with src
dwasint Oct 30, 2023
345a06e
removes redundant code related to name generation
dwasint Oct 30, 2023
c2467c2
Update _base_component.dm
dwasint Oct 30, 2023
70d312d
adds vaguish hint texts to the triggers
dwasint Oct 30, 2023
0b2315a
addresses comments thus far
dwasint Oct 31, 2023
bb45f88
very very basic implementation of the asteroid magnet from dd
dwasint Oct 31, 2023
2074606
adds lab support for other maps
dwasint Oct 31, 2023
021747c
forgot tram
dwasint Oct 31, 2023
b58df10
linter fixes
dwasint Nov 1, 2023
c4ff093
Update asteroid_magnet.dm
dwasint Nov 1, 2023
5a62b32
Update artifact_gun.dm
dwasint Nov 1, 2023
32808e4
addresses comments
dwasint Nov 1, 2023
16966dd
makes common
dwasint Nov 1, 2023
5e6671e
fixes
dwasint Nov 1, 2023
a288202
Update exploration.dm
dwasint Nov 1, 2023
2ca0802
adds the borger artifact
dwasint Nov 1, 2023
4c4c7a7
Merge branch 'master' into art-sci
dwasint Nov 1, 2023
bf9a056
makes excess power generation scary so you should route it through sa…
dwasint Nov 1, 2023
f7557cc
Update xray.dm
dwasint Nov 1, 2023
a890e82
temp asteroid generation and mapping changes
dwasint Nov 1, 2023
a8db100
metastation fixes artifact generation fixes
dwasint Nov 1, 2023
67bf2da
tons of new faults
dwasint Nov 1, 2023
4862358
makes faults triggerable
dwasint Nov 1, 2023
2979d34
whoops
dwasint Nov 1, 2023
162f620
Update structures.dm
dwasint Nov 1, 2023
f60a3c5
shit
dwasint Nov 1, 2023
d601fd8
fixes magnet destruction, warp fault, analysis form
dwasint Nov 1, 2023
1dad410
displays cooldown for magnet
dwasint Nov 1, 2023
fd5f2f3
stops faults from triggering if given the correct stimuli in certain …
dwasint Nov 1, 2023
a970d19
whoops
dwasint Nov 1, 2023
375f678
fixes ui and analysis form
dwasint Nov 1, 2023
874c3e6
adds unsubbed rank
dwasint Nov 2, 2023
8b1ab75
Update MetaStation.dmm
dwasint Nov 2, 2023
bc8c8ce
art sci changes
dwasint Nov 4, 2023
8ec0bb1
Update just_death.dm
dwasint Nov 4, 2023
48b01a0
lowers reagents by 15x base and 4x cap
dwasint Nov 5, 2023
894625a
beam
dwasint Nov 5, 2023
04b844c
ffs
dwasint Nov 5, 2023
6987747
Update explosion.dm
dwasint Nov 5, 2023
25f811f
this takes ages
dwasint Nov 5, 2023
2422214
changes
dwasint Nov 5, 2023
9fe5274
replaces gib with death
dwasint Nov 5, 2023
158799e
should fix the cargo issue
dwasint Nov 10, 2023
566a34e
Merge branch 'master' into art-sci
dwasint Nov 12, 2023
f8d31f7
Merge branch 'master' into art-sci
dwasint Nov 12, 2023
045ac15
Update station.dm
dwasint Nov 12, 2023
f81bc73
updated ore magnet
dwasint Nov 18, 2023
838762f
maps
dwasint Nov 18, 2023
9cb474d
"fixes" multi-z asteroid generation
dwasint Nov 18, 2023
8e62d51
goon icon
dwasint Nov 18, 2023
4f251cd
unselects template after loading
dwasint Nov 18, 2023
4168621
Update asteroid_magnet.dm
dwasint Nov 19, 2023
f225f85
for TM
dwasint Nov 19, 2023
4f0978b
Merge branch 'master' into art-sci
dwasint Nov 20, 2023
f09d307
whoops
dwasint Nov 21, 2023
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
6 changes: 1 addition & 5 deletions _maps/RandomRuins/SpaceRuins/anomaly_research.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,10 +1130,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/white,
/area/misc/anomaly_research)
"Ch" = (
/obj/machinery/rnd/experimentor,
/turf/open/floor/engine,
/area/misc/anomaly_research)
"Cl" = (
/obj/effect/spawner/structure/window/plasma,
/turf/open/floor/engine,
Expand Down Expand Up @@ -2533,7 +2529,7 @@ oI
Fg
Fm
Jy
Ch
CI
pu
AV
xE
Expand Down
3 changes: 0 additions & 3 deletions _maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@
/area/ruin/space/unpowered)
"pl" = (
/obj/structure/table,
/obj/item/relic{
pixel_y = 5
},
/turf/open/floor/mineral/plastitanium/red/airless,
/area/ruin/space/unpowered)
"qL" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7926,7 +7926,6 @@
/obj/structure/closet/crate/secure/science{
req_access = list("away_science")
},
/obj/item/relic,
/obj/item/transfer_valve,
/obj/item/raw_anomaly_core/bluespace,
/obj/item/raw_anomaly_core/random,
Expand Down
23 changes: 2 additions & 21 deletions _maps/RandomZLevels/snowdin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7266,8 +7266,6 @@
"yj" = (
/obj/machinery/light/directional/west,
/obj/structure/closet/crate,
/obj/item/relic,
/obj/item/relic,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
Expand Down Expand Up @@ -7346,9 +7344,6 @@
/area/awaymission/snowdin/outside)
"yx" = (
/obj/structure/closet/crate,
/obj/item/relic,
/obj/item/relic,
/obj/item/relic,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"yy" = (
Expand Down Expand Up @@ -10988,14 +10983,6 @@
slowdown = 1
},
/area/awaymission/snowdin/cave)
"Pc" = (
/obj/structure/closet/crate,
/obj/item/relic,
/obj/item/relic,
/obj/item/relic,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"Pd" = (
/turf/open/misc/asteroid/snow{
floor_variance = 0;
Expand Down Expand Up @@ -11697,12 +11684,6 @@
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/engineering)
"SN" = (
/obj/structure/closet/crate,
/obj/item/relic,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"SQ" = (
/obj/machinery/light/small/directional/west,
/obj/item/stack/rods{
Expand Down Expand Up @@ -62841,7 +62822,7 @@ wL
wL
WB
yj
Pc
Sm
xW
eJ
eJ
Expand Down Expand Up @@ -63097,7 +63078,7 @@ xy
Tn
xy
WB
SN
Sm
yx
wD
eJ
Expand Down
Loading
Loading