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.

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

Parrot rework squarshed #37

Closed
wants to merge 69 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e57fcbd
i'm dying jessser
san7890 Sep 5, 2023
e8ad148
RURURUGHHGH
san7890 Sep 5, 2023
d7c2bb3
gwak gwak
san7890 Sep 5, 2023
6e33017
GLORGUISIFSA
san7890 Sep 5, 2023
82b0cc2
might be having a skill issue rn
san7890 Sep 5, 2023
cecc563
i barely feel my head
san7890 Sep 5, 2023
e86404b
JESUS CHRIST
san7890 Sep 5, 2023
937c711
alright that should be a good chunk of memory
san7890 Sep 5, 2023
f5f4bb8
alright that should be a good chunk of memory
san7890 Sep 5, 2023
54508a9
code kleenup
san7890 Sep 5, 2023
b0b1d71
glorgisisiss
san7890 Sep 5, 2023
295441a
fucking uuuhhhhhh
san7890 Sep 5, 2023
40594b2
almost time to make sure the speech works
san7890 Sep 5, 2023
28e89d4
makes it compile
san7890 Sep 5, 2023
9d4622c
more tinkering
san7890 Sep 5, 2023
cf1f530
MOAR
san7890 Sep 5, 2023
c7954b9
WOOOO SPEECH WORKS
san7890 Sep 5, 2023
7482070
roundend callback to save memory
san7890 Sep 5, 2023
0d30999
MORE BULLSHIT
san7890 Sep 5, 2023
e81d6c4
MUUUUUUURGGGG
san7890 Sep 5, 2023
07ae0f4
probably a good stopping point
san7890 Sep 5, 2023
50fff74
reworks strippable items mayb
san7890 Sep 5, 2023
3b086d5
it sitll won't compile but that's later issue
san7890 Sep 5, 2023
11e1dbe
probably more stuff
san7890 Sep 5, 2023
ef1817c
does the snaggy stuff
san7890 Sep 5, 2023
bee2d6f
some perching dogshit
san7890 Sep 5, 2023
7b155da
more cleanup
san7890 Sep 5, 2023
c2b7107
okay flarp this
san7890 Sep 5, 2023
971689c
makes it compile
san7890 Sep 5, 2023
5a40024
less linter crap
san7890 Sep 5, 2023
8411c2c
fixes a subtype issue
san7890 Oct 12, 2023
a949839
alphabetizes a list
san7890 Oct 12, 2023
9a524a8
deletes useless default speech prob
san7890 Oct 12, 2023
aab0f08
early continue to `steal_from_mob()`
san7890 Oct 12, 2023
faca9c0
that should be inverted
san7890 Oct 12, 2023
c6c7091
misc. code cleanup
san7890 Oct 12, 2023
9e73e75
adds the default poly phrases to the static list
san7890 Oct 12, 2023
c70fd6b
misc. code cleanup
san7890 Oct 12, 2023
290d3f6
whoops
san7890 Oct 12, 2023
e470e97
TYPE_PROC_REF for say
san7890 Oct 12, 2023
b28db74
Parrottai (#34)
Ben10Omintrix Nov 13, 2023
af3678c
fixes alphabetizations
san7890 Nov 13, 2023
43e0c71
multilines that addcomponent
san7890 Nov 13, 2023
75dcc58
removes the movemanager thing
san7890 Nov 13, 2023
ff12c7b
qdels on login
san7890 Nov 13, 2023
36c3186
Oojo (#35)
Ben10Omintrix Nov 15, 2023
55216cd
deletes the autochangelogs
san7890 Nov 15, 2023
09961e5
caches code + code opt
san7890 Nov 15, 2023
4c2dca3
more changelog cleaning
san7890 Nov 15, 2023
4485fff
oh i fucked up that merge conflict
san7890 Nov 15, 2023
c665f83
moves traits + splits up some fiels
san7890 Nov 15, 2023
b1c10b1
deletes needless documentation
san7890 Nov 15, 2023
d3fc9fa
undefs
san7890 Nov 15, 2023
53005d9
alphabetizes the unit test thing
san7890 Nov 15, 2023
970cf9e
alphabetizes the ridable typecache
san7890 Nov 15, 2023
d17b0e6
whoops trait broke
san7890 Nov 15, 2023
ec7596f
MORE UNDEFS
san7890 Nov 15, 2023
96a5541
epic DME fail
san7890 Nov 15, 2023
956ce9a
should fix TFE?
san7890 Nov 15, 2023
821b8cf
adds updatepaths
san7890 Nov 15, 2023
9925690
runs updatepaths
san7890 Nov 15, 2023
c64b7bc
Kobsa Code Review
san7890 Nov 15, 2023
6a6cdef
`desired_perches` is typecache
san7890 Nov 15, 2023
89ae9ac
fixes the DCS issue and centralizes edibles
san7890 Nov 15, 2023
9b218ad
`CARBON_GENERIC_BODY_ZONES` ended up being useless
san7890 Nov 15, 2023
6ea5dad
deletes `parrot_damage_upper`
san7890 Nov 15, 2023
804da3c
more parrot code cleaning
san7890 Nov 15, 2023
ecde906
oh we should rename parrot.dm too huh
san7890 Nov 15, 2023
81accc4
patches up `Write_Memory()` to be nicer
san7890 Nov 15, 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
Prev Previous commit
patches up Write_Memory() to be nicer
  • Loading branch information
san7890 committed Nov 15, 2023
commit 81accc4835be4b15d3e3866e55eef8141d588822
5 changes: 3 additions & 2 deletions code/modules/mob/living/basic/pets/parrot/poly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
/mob/living/basic/parrot/poly/Write_Memory(dead, gibbed)
. = ..()
if(!. || memory_saved) // if we die, no more memory
return
return FALSE

if(!dead && (stat != DEAD))
dead = FALSE
Expand All @@ -161,7 +161,7 @@
var/list/file_data = list()

var/list/exportable_speech_buffer = ai_controller.blackboard[BB_EXPORTABLE_STRING_BUFFER_LIST] // should have been populated when we sent the signal out on parent
if(length(exportable_speech_buffer))
if(!!length(exportable_speech_buffer))
file_data["phrases"] = exportable_speech_buffer

if(dead)
Expand Down Expand Up @@ -189,6 +189,7 @@

rustg_file_write(formatted_data, file_path)
memory_saved = TRUE
return TRUE

/mob/living/basic/parrot/poly/setup_headset()
ears = new /obj/item/radio/headset/headset_eng(src)
Expand Down
Loading