 DragonTrance
|
7bb205f940
|
nightmares have objectives now
|
2021-02-24 17:30:09 -07:00 |
|
|
QuoteFoxandGitHub
|
25fb9040a1
|
Merge pull request #990 from DragonTrance/im-getting-thirsty
sorting thirst code + not-water now replenishes hydration
|
2021-02-24 00:45:17 +00:00 |
|
|
DragonTrance
|
87204ff739
|
Update species.dm
|
2021-02-23 17:36:44 -07:00 |
|
|
DragonTrance
|
cd3ca2b8d1
|
sorting thirst code + not-water replenishes hydration
|
2021-02-23 17:19:06 -07:00 |
|
|
QuoteFoxandGitHub
|
300b8bfc08
|
Merge pull request #989 from DragonTrance/mood-aa
Overweight quirk
|
2021-02-23 21:07:31 +00:00 |
|
|
DragonTrance
|
5740825e1b
|
only start fat
|
2021-02-23 14:04:34 -07:00 |
|
|
DragonTrance
|
b37e1db35e
|
a
|
2021-02-23 13:55:15 -07:00 |
|
|
DragonTrance
|
ab941f0406
|
forgot one thing
|
2021-02-23 13:50:43 -07:00 |
|
|
DragonTrance
|
15094b8b12
|
enjoy being fat with quirks!
|
2021-02-23 13:46:07 -07:00 |
|
|
QuoteFoxandGitHub
|
99d2a0c4ee
|
Merge pull request #987 from lyricalpaws/master
Port PR #14263 from Citadel-Station-13
|
2021-02-23 19:56:55 +00:00 |
|
|
Chloe Carver-Brown
|
3f57139f8a
|
Bazim Bazzam
|
2021-02-23 19:14:29 +00:00 |
|
|
ChloeandGitHub
|
e228770ff9
|
Merge pull request #5 from quotefox/master
update
|
2021-02-23 18:02:27 +00:00 |
|
|
QuoteFox
|
700b22988f
|
Fixed a game breaking bug. Phew.
Glad I caught that.
|
2021-02-22 23:18:16 +00:00 |
|
|
QuoteFox
|
9dd61f3efb
|
Pens now write on people, Harm intent to stab them like the old way.
Washable at showers.
|
2021-02-22 23:08:42 +00:00 |
|
|
QuoteFoxandGitHub
|
4818d77ea4
|
Merge pull request #986 from DragonTrance/plant-adding
Smol botany fixes
|
2021-02-22 19:47:13 +00:00 |
|
|
DragonTrance
|
9b8fc88089
|
datum + typo
|
2021-02-22 12:43:58 -07:00 |
|
|
DragonTrance
|
f70a3f8277
|
botany fixes
Fixes crate datum, hydroponic chemical reactions requiring a seed, indentation, and spades not resetting life timers
|
2021-02-22 12:21:39 -07:00 |
|
|
QuoteFox
|
506f6b19be
|
Thirst, mood buff for qunching, No longer spawn thirsty, no longer suicidal if starving and dehydrated alone.
|
2021-02-22 19:12:01 +00:00 |
|
|
QuoteFoxandGitHub
|
b1dbf03769
|
Merge pull request #985 from TotallyNotADog/fixKitchenTables
stupid bar tables again
|
2021-02-22 06:06:03 +00:00 |
|
|
TotallyNotADog
|
3baa2f395a
|
stupid bar tables again
|
2021-02-21 23:50:08 -06:00 |
|
|
QuoteFoxandGitHub
|
3ca1dfecda
|
Merge pull request #984 from DragonTrance/plant-adding
Fixes gaia not being applied to trays correctly
|
2021-02-22 04:11:42 +00:00 |
|
|
DragonTrance
|
d7644adb8c
|
hopefully fix
|
2021-02-21 21:10:33 -07:00 |
|
|
QuoteFox
|
4c8865bbd3
|
ashtray now holds cig butts
|
2021-02-22 01:45:29 +00:00 |
|
|
QuoteFox
|
1c509bd31e
|
Roleplay Warning smite.
|
2021-02-22 00:54:05 +00:00 |
|
|
QuoteFox
|
711e52cc09
|
compile errors fixed.
|
2021-02-21 23:54:50 +00:00 |
|
|
QuoteFoxandGitHub
|
973e45e102
|
Merge pull request #983 from DragonTrance/plant-adding
Botany Changes
|
2021-02-21 23:08:24 +00:00 |
|
|
DragonTrance
|
3da00de2cd
|
opaque > transparent
|
2021-02-21 14:22:46 -07:00 |
|
|
QuoteFoxandGitHub
|
ad2b9d452c
|
Merge pull request #982 from Kharkov72/sign
Welcome to the cum zone
|
2021-02-21 21:13:07 +00:00 |
|
|
DragonTrance
|
09038b7659
|
Merge branch 'plant-adding' of https://github.com/DragonTrance/Hyper-Station-13 into plant-adding
|
2021-02-21 12:09:21 -07:00 |
|
|
DragonTrance
|
aac2f47e38
|
i hope to god this doesnt make it conflicted again
|
2021-02-21 12:08:59 -07:00 |
|
|
DragonTranceandGitHub
|
3ebb7488de
|
Merge branch 'master' into plant-adding
|
2021-02-21 12:06:48 -07:00 |
|
|
DragonTrance
|
0dea34de3a
|
test
|
2021-02-21 12:03:05 -07:00 |
|
|
DragonTranceandGitHub
|
5e37c0d957
|
github please i beg you
|
2021-02-21 11:45:07 -07:00 |
|
|
DragonTrance
|
18b188f46e
|
conflicts
|
2021-02-21 11:42:04 -07:00 |
|
|
DragonTrance
|
2c5752fbe0
|
testing to see if this affects conflicts
|
2021-02-21 11:12:23 -07:00 |
|
|
DragonTranceandGitHub
|
84d8e1a44f
|
Update organic.dm
|
2021-02-21 11:01:51 -07:00 |
|
|
DragonTrance
|
c729c61765
|
added tons of botany changes from citadel (not instability)
|
2021-02-21 09:57:29 -07:00 |
|
|
DragonTrance
|
24cb27b67c
|
#5
|
2021-02-21 08:37:10 -07:00 |
|
|
QuoteFox
|
7d7c6fedc9
|
asay notifications
for admins.
|
2021-02-21 11:40:02 +00:00 |
|
|
QuoteFox
|
8e12eae0f3
|
fix patreon reward
|
2021-02-21 11:08:37 +00:00 |
|
|
QuoteFox
|
d24bafb858
|
Removed "Your back is feeling a little sore" and useless titty messages.
|
2021-02-21 10:57:58 +00:00 |
|
|
Kharkov72
|
4e2d9a3bd0
|
I cannot let this go unadded
|
2021-02-21 00:53:05 -05:00 |
|
|
QuoteFoxandGitHub
|
143fce334f
|
Merge pull request #981 from lyricalpaws/master
Lets people (ACTUALLY) change the engravings on zippos
|
2021-02-20 18:42:14 +00:00 |
|
|
Chloe Carver-Brown
|
63063ecd9b
|
It liiiiiives
|
2021-02-20 14:48:12 +00:00 |
|
|
ChloeandGitHub
|
3bff1b5a64
|
Merge pull request #4 from quotefox/master
update
|
2021-02-20 14:22:10 +00:00 |
|
|
QuoteFoxandGitHub
|
1326cf32eb
|
Merge pull request #980 from lyricalpaws/clustaur
Clustaur grenades
|
2021-02-20 06:32:18 +00:00 |
|
|
QuoteFoxandGitHub
|
940a6b0ade
|
Merge pull request #979 from lyricalpaws/master
Lets people change the engravings on zippos
|
2021-02-20 06:31:59 +00:00 |
|
|
QuoteFoxandGitHub
|
10f7bafdd4
|
Merge pull request #978 from Chemlight/AI-time-lock
Time requirement on AI
|
2021-02-20 00:50:51 +00:00 |
|
|
Chloe Carver-Brown
|
a38a978f70
|
Revert "Poggers"
This reverts commit 389291b46a.
|
2021-02-19 23:35:57 +00:00 |
|
|
Chloe Carver-Brown
|
6d8d602907
|
Adding clustaur grenades
|
2021-02-19 23:21:12 +00:00 |
|