Commit Graph

31561 Commits

Author SHA1 Message Date
Heroman
71e124718e Adds food vore 2023-08-22 20:12:24 +10:00
Heroman3003
505df6a184 Merge pull request #15290 from Very-Soft/outdoors
Being outdoors doesn't mean you can be dark forever
2023-08-22 05:23:51 +10:00
Heroman3003
f7f9d890a0 Merge pull request #15289 from ItsSelis/pray-logging
Minor pray verb improvements
2023-08-22 05:15:16 +10:00
VerySoft
80822a1e96 Final 2023-08-21 15:14:08 -04:00
VerySoft
791d6be9b9 wiggle 2023-08-21 14:43:14 -04:00
VerySoft
71b36b59a0 Being outdoors doesn't mean you can be dark forever 2023-08-21 14:08:24 -04:00
Selis
67ebdeaaa8 Adds pray filter to vchat 2023-08-21 15:47:11 +02:00
Selis
df2135963a typo fixes 2023-08-21 15:21:20 +02:00
Heroman3003
39bf0f33f8 Merge pull request #15288 from Heroman3003/fake-weather
Adds fake weather options to fake sun
2023-08-21 20:38:37 +10:00
Heroman3003
4b1945195b Merge pull request #15287 from Screemonster/allthepakkunsoftherainbow
Adds more pakkuns
2023-08-21 20:38:25 +10:00
Heroman
1c9018eb6b Adds fake weather options to fake sun 2023-08-21 20:18:49 +10:00
DESKTOP-4BUBN9N\Mike
9a4915181c these are not proper nouns 2023-08-21 03:19:22 +01:00
DESKTOP-4BUBN9N\Mike
e023a0c6c2 who put all these lizards in the crayon box 2023-08-21 02:33:30 +01:00
TankTheBirb
92a02e9376 Adds fox and kitsune taur halves
Ported from chomp, artist permission given for the up-port.
2023-08-20 18:39:45 -04:00
Heroman
b334704688 Allows Purrverick to wear hats 2023-08-20 13:51:50 +10:00
Heroman3003
869bdb4371 Merge pull request #15281 from Heroman3003/scughats
Adds scug hats
2023-08-20 13:02:33 +10:00
Heroman
d27d175f5c Adds scug hats 2023-08-20 12:49:25 +10:00
Heroman
871310778d A variety of fixes 2023-08-20 10:28:19 +10:00
Selis
95a2a89d63 Pray improvements 2023-08-19 20:09:19 +02:00
Heroman3003
cb2b31f556 Merge pull request #15250 from Runa-Dacino/bloodfix
Fixes human mobs ending up with their blood datums deleted, creates fallback if that still happens
2023-08-19 08:12:31 +10:00
Runa Dacino
62ffeb661a tweak(blood): Implements Maintainer Requests
removes(blood): Removes remove_blood scaling with mob size
tweak(blood): Simplifies minimum process check in take_blood
2023-08-19 00:03:57 +02:00
ShadeAware
5508f03ebb mmm funny mask 2023-08-18 15:00:41 -04:00
Heroman3003
5fabd9f272 Merge pull request #15275 from Heroman3003/shadekin-fixes
Fixes some shadekin issues
2023-08-18 06:38:28 +10:00
Heroman3003
feb9fa3fd6 Update language.dm 2023-08-18 06:29:15 +10:00
Heroman3003
963f2e06aa Merge pull request #15272 from Very-Soft/oocnotes
Revise OOC notes panel
2023-08-18 06:27:15 +10:00
Heroman
223876f1ab Fixes some shadekin issues 2023-08-18 06:11:34 +10:00
Killian
990819109a reset buttons 2023-08-17 05:58:09 +01:00
VerySoft
f6448f8eb1 This is why we test 2023-08-16 20:32:35 -04:00
VerySoft
9756378aae More then one window!!! 2023-08-16 20:18:33 -04:00
VerySoft
90981fa620 Revise OOC notes panel
Revises the OOC notes panel a bit, and removes the OOC notes panel from character setup, in favor of just adding buttons to set the likes and dislikes there, rather than maintaining two different versions of the panel.

Additionally, adds a 'print to chat' button to the panel, and to examine for the OOC notes.

Changes the way the window is sent to the client so that it behaves more like character setup. This should mitigate edge cases where the panel appears off screen when SS13 is not being displayed on the primary monitor. It SHOULD also remember its position between sessions. Either way it should stay on your screen now.

Also, for the print to chat, character directory, and any OOC notes panel that isn't yours, the LIKES and DISLIKES sections will show up conditionally depending on if they are actually set up. If there's nothing there, then they won't show up.

This is presently an imperfect revision, as it only allows you to have one OOC notes panel open at a time. I would like you to be able to have more than one at a time, while also having the features to allow it to always appear on the screen, however, that will take some extra development time.

Apart from that, this is fully functional.
2023-08-16 05:44:59 -04:00
Heroman3003
a7411bc24b Merge pull request #15266 from Heroman3003/seagull
Adds a seagull
2023-08-16 17:22:19 +10:00
Heroman
9852a24114 A bunch of small fixes 2023-08-16 17:03:05 +10:00
Heroman
e5d24e2f1a Adds a seagull 2023-08-16 06:32:35 +10:00
Heroman3003
36b26c5c2a Merge pull request #15264 from Heroman3003/runtime-fixes-2
Attempts to fix two different cascading runtimes
2023-08-15 17:57:31 +10:00
Heroman
312b5e2a28 Adds sanity check to spin() 2023-08-15 17:40:56 +10:00
Heroman
bdb765a8ea Attempts to fix two different cascading runtimes 2023-08-15 17:03:28 +10:00
Heroman3003
cba0a05e83 Update vending_refills.dm 2023-08-15 15:16:22 +10:00
Heroman
328af43db9 A variety of smaller fixes 2023-08-15 15:12:32 +10:00
Heroman3003
0314f15fdd Merge pull request #15255 from Heroman3003/butons-fix
Fixes wrong category of hud on the new buttons
2023-08-14 18:34:48 +10:00
Heroman3003
393b8f3e8b Merge pull request #15257 from Heroman3003/foxlore
Rewrites Zorren lore blurb
2023-08-14 18:34:41 +10:00
Heroman
86312cbece Grammar 2023-08-14 18:05:11 +10:00
Heroman
2e142fa8ef Rewrites Zorren lore blurb 2023-08-14 18:00:50 +10:00
Heroman
5a7aff525d Renames some borg sprite appearances 2023-08-14 16:21:35 +10:00
Heroman
9acf4eb450 Fixes wrong category of hud on the new buttons 2023-08-14 15:32:48 +10:00
Casey
da845841f5 Merge pull request #15253 from ItsSelis/sql-injection-fix
Bugfix for the Bugfix
2023-08-13 19:18:23 -04:00
Selis
4b6aa323e9 Bugfix for the Bugfix 2023-08-14 01:07:10 +02:00
Heroman3003
c372f5354f Merge pull request #15252 from Very-Soft/robotspecies
Robot species
2023-08-14 06:48:07 +10:00
VerySoft
a18769d634 Adjust 2023-08-13 16:37:06 -04:00
Casey
502e9e0f18 Merge pull request #15251 from ItsSelis/sql-injection-fix
SQL Injection Fix
2023-08-13 16:08:04 -04:00
VerySoft
f1b72cc7ed Robot species
Robots don't have a species but now it will tell people what sprite you picked in your examine text, similar to how species is done for carbon mobs!
2023-08-13 15:58:06 -04:00