Skip to content

Frankenstein Station 13: Introducing dissections and alien organs to xenobiology #29093

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.

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

Open
wants to merge 127 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
2fbd89a
ddsadsa
EmeraldCandy Feb 23, 2024
9ded00d
Merge branch 'master' of https://github.com/EmeraldCandy/Paradise
EmeraldCandy Feb 24, 2024
db21fa0
Merge branch 'master' of https://github.com/EmeraldCandy/Paradise
EmeraldCandy May 9, 2024
ec716ae
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jun 2, 2024
4fbb3dc
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jun 3, 2024
8624f29
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jun 29, 2024
4ac8d2e
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jul 1, 2024
0c375a9
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jul 1, 2024
44441f9
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 5, 2024
549bcf1
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 7, 2024
fcd6817
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 9, 2024
0122580
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 9, 2024
0d6a166
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 14, 2024
378a6c5
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 14, 2024
403c8de
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 16, 2024
bb7fb90
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Aug 20, 2024
24b3584
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Oct 7, 2024
e750c9d
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Dec 17, 2024
bea23c0
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Dec 22, 2024
9142e7c
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jan 2, 2025
1726127
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jan 6, 2025
a09f6a1
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Jan 19, 2025
e072ad9
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Feb 3, 2025
19b4a0f
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Feb 12, 2025
2e01142
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Feb 13, 2025
0caa384
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Feb 18, 2025
12bcf07
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Feb 24, 2025
7f1b667
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Mar 1, 2025
e4c093f
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Mar 13, 2025
ded0c78
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Mar 17, 2025
0248971
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Mar 18, 2025
8706cd7
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Mar 21, 2025
63ce83c
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Mar 28, 2025
bf3407c
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 4, 2025
25c1b59
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 5, 2025
92add3c
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 8, 2025
5e88745
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 8, 2025
80f2026
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 11, 2025
60505b1
moderate again
EmeraldCandy Apr 11, 2025
86d1d24
revert
EmeraldCandy Apr 11, 2025
b1a0006
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 11, 2025
53494ee
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 18, 2025
3525733
beginning with rebase
EmeraldCandy Apr 19, 2025
447b18f
organssssssssss
EmeraldCandy Apr 21, 2025
8ee7bef
organs now process!
EmeraldCandy Apr 22, 2025
0e241e8
analyzer finished! + mapping
EmeraldCandy Apr 22, 2025
3f09792
tool bit implementation and quality
EmeraldCandy Apr 23, 2025
15e2310
organs and fixes and reworks
EmeraldCandy Apr 23, 2025
f973658
more organ work
EmeraldCandy Apr 24, 2025
ae578d7
more organs done
EmeraldCandy Apr 24, 2025
9946849
more organ progress!
EmeraldCandy Apr 25, 2025
634baa5
more organ work
EmeraldCandy Apr 25, 2025
18bf751
MORE. ORGANS.
EmeraldCandy Apr 26, 2025
5e8d500
temp
BeagleGaming1 Apr 26, 2025
cfa71b6
Merge pull request #4 from BeagleGaming1/test
EmeraldCandy Apr 26, 2025
6371797
more organsssss
EmeraldCandy Apr 26, 2025
f7a3c5c
ITS DONE!!!!!!!!
EmeraldCandy Apr 28, 2025
0022ae7
oops
EmeraldCandy Apr 28, 2025
f36df55
also oops
EmeraldCandy Apr 28, 2025
a2cd328
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy Apr 28, 2025
ad98a07
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy Apr 28, 2025
973f047
linter stuff
EmeraldCandy Apr 28, 2025
1f4c602
forgot this + oops
EmeraldCandy Apr 28, 2025
7e4fbfc
linter
EmeraldCandy Apr 28, 2025
da7ab5c
i forgot to save!
EmeraldCandy Apr 28, 2025
2bb0a99
lots of improvements and tweaks
EmeraldCandy Apr 28, 2025
f07d6e5
move icon over
EmeraldCandy Apr 29, 2025
8b57a9c
icon tweaks
EmeraldCandy Apr 29, 2025
0c1e8b5
icon mistake
EmeraldCandy Apr 29, 2025
fe44861
oops
EmeraldCandy Apr 29, 2025
54bd2c5
dumb
EmeraldCandy Apr 29, 2025
7167915
more icon validations
EmeraldCandy Apr 29, 2025
d277b93
i think thisll fix it?
EmeraldCandy Apr 29, 2025
097af64
Apply suggestions from code review
EmeraldCandy Apr 29, 2025
35df370
fixes
EmeraldCandy Apr 29, 2025
05af4da
Merge branch 'Xenobiology-Dissections' of https://github.com/EmeraldC…
EmeraldCandy Apr 29, 2025
5709eab
fixes+tweaks
EmeraldCandy Apr 30, 2025
6fcca54
fix
EmeraldCandy Apr 30, 2025
080f168
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy Apr 30, 2025
c65a823
oops
EmeraldCandy Apr 30, 2025
12ea73b
Merge branch 'Xenobiology-Dissections' of https://github.com/EmeraldC…
EmeraldCandy Apr 30, 2025
dfd89d3
linter
EmeraldCandy Apr 30, 2025
ad45544
i didnt save....
EmeraldCandy Apr 30, 2025
855f400
this should give -some- warning
EmeraldCandy Apr 30, 2025
4f77dbc
forgot a span
EmeraldCandy Apr 30, 2025
608a765
Apply suggestions from code review
EmeraldCandy Apr 30, 2025
871a7b9
Apply suggestions from code review
EmeraldCandy Apr 30, 2025
ba45cd7
beginning edits
EmeraldCandy May 1, 2025
be8dec8
Merge branch 'Xenobiology-Dissections' of https://github.com/EmeraldC…
EmeraldCandy May 1, 2025
d354aae
more fixed and tweaks with cooldowns
EmeraldCandy May 1, 2025
e0a7364
Apply suggestions from code review
EmeraldCandy May 2, 2025
cb55d27
lots of tweaks
EmeraldCandy May 2, 2025
9a3eefb
Merge branch 'Xenobiology-Dissections' of https://github.com/EmeraldC…
EmeraldCandy May 2, 2025
ce37c18
more review changes
EmeraldCandy May 2, 2025
9fbe4e4
comment change
EmeraldCandy May 2, 2025
0719ff2
Apply suggestions from code review
EmeraldCandy May 2, 2025
78e973f
returns start back to gland
EmeraldCandy May 2, 2025
0670fcd
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy May 5, 2025
0207aa8
Apply suggestions from code review
EmeraldCandy May 5, 2025
d27cd5d
code review fixes
EmeraldCandy May 5, 2025
83eaf9f
trying to make surgery work....
EmeraldCandy May 7, 2025
9a40a3b
might as well push this
EmeraldCandy May 8, 2025
940a69d
perfection. now i need text
EmeraldCandy May 8, 2025
17f5622
Merge branch 'Xenobiology-Dissections' of https://github.com/EmeraldC…
EmeraldCandy May 8, 2025
f486d2a
text + small tweaks and bugfixing
EmeraldCandy May 8, 2025
82c9b3c
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy May 8, 2025
f39056f
linting
EmeraldCandy May 8, 2025
245bfc1
Merge branch 'Xenobiology-Dissections' of https://github.com/EmeraldC…
EmeraldCandy May 8, 2025
8dbc900
forgot to implement this
EmeraldCandy May 8, 2025
0eff7de
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy May 10, 2025
67ec444
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy May 10, 2025
a4f56e6
deconflicting maps
EmeraldCandy May 10, 2025
e4cd09b
modifying for xenos again
EmeraldCandy May 13, 2025
4f2d0b1
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy May 13, 2025
4db0dbf
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy May 13, 2025
2f5269c
i guess this wasnt needed???
EmeraldCandy May 13, 2025
ebf1dfc
added surgical belts to xeno
EmeraldCandy May 13, 2025
83dabfc
Merge branch 'ParadiseSS13:master' into master
EmeraldCandy May 17, 2025
880ae8a
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy May 17, 2025
bf8eb33
Merge branch 'master' into Xenobiology-Dissections
EmeraldCandy May 21, 2025
57ed294
minor swap
EmeraldCandy May 21, 2025
8307171
quick fix
EmeraldCandy May 21, 2025
d2aca88
small tweaks
EmeraldCandy May 21, 2025
9ae472b
small tweak
EmeraldCandy May 21, 2025
2b05834
tiny tweak
EmeraldCandy May 21, 2025
5758bcd
some slime updates
EmeraldCandy May 21, 2025
d4b8eb7
more tweaks
EmeraldCandy May 21, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
/area/ruin/powered/sloth)
"f" = (
/obj/structure/table/wood,
/obj/item/organ/internal/kidneys/xenobiology/lethargic,
/obj/item/food/grown/citrus/orange,
/turf/simulated/floor/sepia{
slowdown = 10
Expand Down
4 changes: 4 additions & 0 deletions _maps/map_files/generic/centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6024,6 +6024,7 @@
pixel_x = -2;
pixel_y = 1
},
/obj/item/dissector,
/turf/simulated/floor/plasteel/freezer,
/area/admin)
"vl" = (
Expand Down Expand Up @@ -6212,6 +6213,8 @@
"vM" = (
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
/obj/item/organ/internal/heart/xenobiology/cursed_bananium,
/obj/item/organ/internal/heart/xenobiology/bananium,
/turf/simulated/floor/plasteel/dark,
/area/admin)
"vN" = (
Expand Down Expand Up @@ -6429,6 +6432,7 @@
pixel_x = 5;
pixel_y = 5
},
/obj/item/dissector/alien,
/turf/simulated/floor/plasteel/freezer,
/area/admin)
"wA" = (
Expand Down
Loading