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

Cats reforged (literally refractor of mobs and such) #4686

Merged
merged 44 commits into from
Jan 7, 2025
Merged

Cats reforged (literally refractor of mobs and such) #4686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
273d2a0
Cats reforged (literally refractor of mobs, ai and some minor quality…
Syndicat-Meow Dec 26, 2024
d792645
why did this not send?
Syndicat-Meow Dec 26, 2024
d993a2b
fixing the discord copy paste
Syndicat-Meow Dec 26, 2024
3a91d11
SEND IT!!!
Syndicat-Meow Dec 26, 2024
8795b00
hmmm....
Syndicat-Meow Dec 26, 2024
b4ab463
Merge remote-tracking branch 'upstream/master' into upgrades_your_cat
Syndicat-Meow Dec 26, 2024
301ee4b
removes duplicates
Syndicat-Meow Dec 26, 2024
1f5c066
cat
Syndicat-Meow Dec 26, 2024
4860a88
whoopsie
Syndicat-Meow Dec 26, 2024
217d831
WHY DID IT REVIVE?!
Syndicat-Meow Dec 26, 2024
1776e56
should fix shit.
Syndicat-Meow Dec 26, 2024
412438d
switcheroo
Syndicat-Meow Dec 26, 2024
1397527
more switcheroo
Syndicat-Meow Dec 26, 2024
64f8029
flesh
Syndicat-Meow Dec 26, 2024
fd4898f
UNDO!
Syndicat-Meow Dec 26, 2024
b707e96
please do something good
Syndicat-Meow Dec 26, 2024
d7449b3
think that did something
Syndicat-Meow Dec 26, 2024
16dee08
BEGONE ERRORS! also why was plexora off?!
Syndicat-Meow Dec 26, 2024
f2f52da
almost the last one
Syndicat-Meow Dec 26, 2024
c0fcaec
the last one, I can not overcome the wall...
Syndicat-Meow Dec 26, 2024
573ce7b
Oh, but we are not done yet! (must fix more!)
Syndicat-Meow Dec 26, 2024
67b3247
DID YOU KNOW YOU CAN TAME CLOWNS?!
Syndicat-Meow Dec 27, 2024
0ecd8eb
Well you can! With cheeseyhonkers :tm: !
Syndicat-Meow Dec 27, 2024
cf87146
Ride wolf, life good, wolf fight back? KILL WOLF! wolf gone... think …
Syndicat-Meow Dec 27, 2024
26bbb56
can't fix tame that somehow broke even after reverting changes. Aband…
Syndicat-Meow Dec 27, 2024
2f0f449
removal of uneeded extra sounds before leaving as draft and abandonin…
Syndicat-Meow Dec 27, 2024
1e4eeaf
Revert "Ride wolf, life good, wolf fight back? KILL WOLF! wolf gone..…
Syndicat-Meow Dec 29, 2024
889386f
Revert "Well you can! With cheeseyhonkers :tm: !"
Syndicat-Meow Dec 29, 2024
2f4ceb5
Revert "DID YOU KNOW YOU CAN TAME CLOWNS?!"
Syndicat-Meow Dec 29, 2024
332ee2e
Revert "Oh, but we are not done yet! (must fix more!)"
Syndicat-Meow Dec 29, 2024
95646f8
attempted mouse fix? not tested what happens to mouse AI, but as of r…
Syndicat-Meow Dec 29, 2024
5826271
IT LIVESSS!!!! HA HA HA HA IT LIVES!!!
Syndicat-Meow Dec 29, 2024
06a3f5a
override = TRUE since it was suggested
Syndicat-Meow Dec 29, 2024
54184d4
Fixing override warnings and type mismatch.
Coll6 Jan 4, 2025
6dd2baf
Merge pull request #2 from Coll6/fixingkitties
Syndicat-Meow Jan 4, 2025
7d8dbbd
another override warning
Coll6 Jan 4, 2025
cbc1f4a
Merge pull request #3 from Coll6/fixingkitties
Syndicat-Meow Jan 4, 2025
0d332bd
Replacing cats in rest of maps.
Coll6 Jan 4, 2025
4fa1a8e
Merge pull request #6 from Coll6/fixingkitties
Syndicat-Meow Jan 4, 2025
aceeef3
Hopefully fix runtime, replaces rest of cats.
Coll6 Jan 5, 2025
dd9d951
Merge pull request #7 from Coll6/fixingkitties
Syndicat-Meow Jan 5, 2025
ff6620b
Add runtime to required map items.
Coll6 Jan 5, 2025
36f59ca
Merge branch 'Monkestation:master' into upgrades_your_cat
Syndicat-Meow Jan 5, 2025
c1933e4
IT'S THE FINAL COUNTDOWN!!
Syndicat-Meow Jan 5, 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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/derelictsulaco)
"BQ" = (
/mob/living/simple_animal/pet/cat{
/mob/living/basic/pet/cat{
name = "Jonesy";
desc = "Old and grumpy cat- wait, how the hell is he still alive?!"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
/obj/structure/bed/dogbed{
name = "kitty bed"
},
/mob/living/simple_animal/pet/cat/space,
/mob/living/basic/pet/cat/space,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/cat_man)
"aS" = (
Expand Down
Loading
Loading