Skip to content

Commit 2031057

Browse files
EmeraldCandyQwertytofortyBurzahwarriorstar-orionpoobsie
authored
[IDB Ignore] Heretic: The Mansus Re-Opened (#30738)
* fixes * fuck my stupid chungus life * Minion limit, heal fix, dead sac fix * cooldown, no sacrificing star gazer or ascended alive heretics * blade debuff * oopsy * Update tgui.bundle.js * map diff bot what ya doing * fuck that chat spam * lets heretic armour hold a haunted longsword * why not it makes sense * do_after * god I hate this bullshit * other lewc stuff * push * heretic id card fix * she tg on my ui till I css * yes * spent * fix / ipc buff (real):tm: * moderate again * revert * no reserve * bringing up to master * update map files to master * didnt replace centcomm * beginning some rebalancing * aggressive spread tweaks * lots of tweaks and fixes * trying to un-key the maps * maybe this time * this time???? * oops * sql fix * basicmob conversion * paintings! and a critical influence fix * rust + tweaks * monster tweak * small change * removing this * more tweaks. no more dusting * added some examine_more * flower seeds * various tweaks. more to come * no more conduit spacing * fixed some dumb stuff * silly stuff * its always prettier * bugfixes and linters * linters, wow * oops * bah * linter * fuck you * temp check * hidden influence drain * influence visible message * tweak fix * void cloak bugfix * small fixes * fixes * do_after_once broken * fixes and tweaks * heretic blade potential fix + sacrifice changes * batch of fixes * tiny tweak * rebuilt TGUI * no greentext + rerolls * logging + bugfix * unused var * small fix * various fixes * comment * projectile change * tgui rebuild * tgui bundle redo * rune issue solved * influence visible now * fix ui reloading * new moon ascension + fixes + icons * tweaks, species sprites * tgui rebuild * small tweak + linter * harvester icon tweak * spans * fixes and tweaks * caretaker nerf + tweaks * potential fix for knowledge * roller fix * mad mask * Update tgui.bundle.js * void phase tweak * Update tgui.bundle.js * misc tweaks * fix heretic not retargeting correctly with cryo * simplify logic * this is better * lots of fixes and tweaks * Update tgui.bundle.js * linter * linter * fireshark and greyscale insanity * fish * Update tgui.bundle.js * linter * linter * tgui * no window shopping * fish fix * tgui rebundle * moon smile runtime fix * various fixes * sacrifice fixes * insanity is easier now, madness mask changes. * bugfixing + teleport change * linters + tweaks * Update code/modules/antagonists/heretic/status_effects/mark_effects.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/antagonists/heretic/status_effects/mark_effects.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Paul <pmerkamp@gmail.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
1 parent c6f14b4 commit 2031057

File tree

423 files changed

+21430
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

423 files changed

+21430
-445
lines changed

_maps/map_files/stations/boxstation.dmm

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13527,6 +13527,7 @@
1352713527
/area/station/hallway/secondary/garden)
1352813528
"aXI" = (
1352913529
/obj/structure/table/glass,
13530+
/obj/item/seeds/harebell,
1353013531
/turf/simulated/floor/plasteel,
1353113532
/area/station/hallway/secondary/garden)
1353213533
"aXJ" = (
@@ -65861,6 +65862,11 @@
6586165862
},
6586265863
/turf/simulated/floor/plasteel,
6586365864
/area/station/security/permabrig)
65865+
"neT" = (
65866+
/obj/machinery/hydroponics/soil,
65867+
/obj/item/seeds/poppy,
65868+
/turf/simulated/floor/grass,
65869+
/area/station/maintenance/asmaint2)
6586465870
"nfe" = (
6586565871
/obj/structure/cable,
6586665872
/obj/effect/spawner/window/reinforced/polarized/grilled{
@@ -75429,6 +75435,14 @@
7542975435
/obj/effect/mapping_helpers/airlock/access/all/security/evidence,
7543075436
/turf/simulated/floor/plasteel/dark,
7543175437
/area/station/security/evidence)
75438+
"rwv" = (
75439+
/obj/effect/decal/cleanable/dirt,
75440+
/obj/machinery/light_switch{
75441+
name = "north bump";
75442+
pixel_y = 24
75443+
},
75444+
/turf/simulated/floor/plasteel,
75445+
/area/station/maintenance/turbine)
7543275446
"rwR" = (
7543375447
/obj/machinery/door/firedoor,
7543475448
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -78328,14 +78342,6 @@
7832878342
},
7832978343
/turf/simulated/floor/plating,
7833078344
/area/station/maintenance/fore)
78331-
"sPU" = (
78332-
/obj/effect/decal/cleanable/dirt,
78333-
/obj/machinery/light_switch{
78334-
name = "north bump";
78335-
pixel_y = 24
78336-
},
78337-
/turf/simulated/floor/plasteel,
78338-
/area/station/maintenance/turbine)
7833978345
"sQe" = (
7834078346
/obj/structure/table/wood,
7834178347
/obj/item/flashlight/lamp/green{
@@ -129256,7 +129262,7 @@ nZl
129256129262
dcs
129257129263
chf
129258129264
dgT
129259-
sPU
129265+
rwv
129260129266
rvr
129261129267
dcR
129262129268
dde
@@ -134355,7 +134361,7 @@ lqd
134355134361
clX
134356134362
clX
134357134363
nbx
134358-
nbx
134364+
neT
134359134365
cuQ
134360134366
gRe
134361134367
gRe

_maps/map_files/stations/cerestation.dmm

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10385,6 +10385,12 @@
1038510385
},
1038610386
/turf/simulated/floor/plasteel,
1038710387
/area/station/security/permabrig)
10388+
"bGq" = (
10389+
/obj/item/seeds/poppy,
10390+
/turf/simulated/floor/plating{
10391+
icon_state = "asteroidplating"
10392+
},
10393+
/area/station/maintenance/apmaint)
1038810394
"bGs" = (
1038910395
/obj/structure/disposalpipe/junction/reversed{
1039010396
dir = 1
@@ -37254,6 +37260,7 @@
3725437260
/obj/item/reagent_containers/glass/bottle/nutrient/ez{
3725537261
pixel_x = 5
3725637262
},
37263+
/obj/item/seeds/poppy,
3725737264
/turf/simulated/floor/grass/jungle,
3725837265
/area/station/hallway/secondary/garden)
3725937266
"gZz" = (
@@ -111484,6 +111491,11 @@
111484111491
},
111485111492
/turf/simulated/floor/plasteel,
111486111493
/area/station/security/prison/cell_block/a)
111494+
"xfe" = (
111495+
/obj/structure/table/wood,
111496+
/obj/item/seeds/harebell,
111497+
/turf/simulated/floor/grass/jungle,
111498+
/area/station/hallway/secondary/garden)
111487111499
"xfi" = (
111488111500
/obj/machinery/door/airlock/public/glass{
111489111501
name = "Central Access"
@@ -130521,7 +130533,7 @@ lMW
130521130533
jfl
130522130534
gtZ
130523130535
daM
130524-
sKh
130536+
bGq
130525130537
sKh
130526130538
xxb
130527130539
wIq
@@ -150548,7 +150560,7 @@ jJC
150548150560
hXq
150549150561
oTB
150550150562
beb
150551-
beb
150563+
xfe
150552150564
beb
150553150565
aXP
150554150566
aXP

_maps/map_files/stations/deltastation.dmm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70397,6 +70397,7 @@
7039770397
/obj/item/seeds/harebell,
7039870398
/obj/item/seeds/wheat,
7039970399
/obj/item/seeds/watermelon,
70400+
/obj/item/seeds/poppy,
7040070401
/turf/simulated/floor/plasteel,
7040170402
/area/station/maintenance/abandoned_garden)
7040270403
"mWM" = (

_maps/map_files/stations/emeraldstation.dmm

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10320,6 +10320,7 @@
1032010320
/obj/effect/turf_decal/tiles/department/virology/side{
1032110321
dir = 5
1032210322
},
10323+
/obj/item/seeds/poppy,
1032310324
/turf/simulated/floor/plasteel,
1032410325
/area/station/hallway/secondary/garden)
1032510326
"cbf" = (
@@ -15420,6 +15421,12 @@
1542015421
/obj/machinery/light,
1542115422
/turf/simulated/floor/plasteel/dark,
1542215423
/area/station/security/lobby)
15424+
"den" = (
15425+
/obj/effect/spawner/random/oil/maybe,
15426+
/obj/effect/decal/cleanable/dirt,
15427+
/obj/item/seeds/poppy,
15428+
/turf/simulated/floor/plating,
15429+
/area/station/maintenance/security/aft_port)
1542315430
"deF" = (
1542415431
/obj/machinery/alarm/directional/west,
1542515432
/obj/structure/cable{
@@ -46693,6 +46700,7 @@
4669346700
/obj/effect/turf_decal/tiles/department/virology/side{
4669446701
dir = 1
4669546702
},
46703+
/obj/item/seeds/harebell,
4669646704
/turf/simulated/floor/plasteel,
4669746705
/area/station/hallway/secondary/garden)
4669846706
"jqr" = (
@@ -162459,7 +162467,7 @@ oni
162459162467
omp
162460162468
paN
162461162469
hFG
162462-
uaV
162470+
den
162463162471
skm
162464162472
coS
162465162473
eRV

_maps/map_files/stations/metastation.dmm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45058,6 +45058,8 @@
4505845058
/obj/structure/table,
4505945059
/obj/item/hatchet,
4506045060
/obj/effect/spawner/random/maintenance,
45061+
/obj/item/seeds/poppy,
45062+
/obj/item/seeds/harebell,
4506145063
/turf/simulated/floor/grass/no_creep,
4506245064
/area/station/maintenance/abandoned_garden)
4506345065
"iDe" = (

0 commit comments

Comments
 (0)