Artur
|
5acd7fef2d
|
makes salglu not deadly
|
2021-08-02 21:54:47 +03:00 |
|
Artur
|
6b5bdae184
|
salglu works like normal now again and adds more sanity
|
2021-07-29 23:55:27 +03:00 |
|
Artur
|
2fec997e1f
|
No longer neccesary
|
2021-07-29 20:12:38 +03:00 |
|
Artur
|
67de120624
|
Replaces a few more direct blood refillers
|
2021-07-23 18:58:42 +03:00 |
|
Artur
|
be1e9e4e04
|
deals with conflicts
|
2021-07-23 18:53:48 +03:00 |
|
Artur
|
2adfbea215
|
Merge remote-tracking branch 'origin/master' into fake_blood
|
2021-07-23 18:50:09 +03:00 |
|
Changelogs
|
fabd9008dd
|
Automatic changelog compile [ci skip]
|
2021-07-23 00:24:04 +00:00 |
|
CitadelStationBot
|
82244ccee0
|
Automatic changelog generation for PR #14874 [ci skip]
|
2021-07-22 02:53:56 -05:00 |
|
Lin
|
01ed21bb92
|
Merge pull request #14874 from Citadel-Station-13/silicons-patch-41
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
|
2021-07-22 00:53:53 -07:00 |
|
Lin
|
ef556b7824
|
Merge pull request #14902 from silicons/combat_patches_1
misc patches, fixes, some small refactors
|
2021-07-22 00:53:03 -07:00 |
|
Changelogs
|
fe337c34bd
|
Automatic changelog compile [ci skip]
|
2021-07-22 00:23:47 +00:00 |
|
Changelogs
|
e19ff4c480
|
Automatic changelog compile [ci skip]
|
2021-07-21 00:25:59 +00:00 |
|
Changelogs
|
ff0f9f651a
|
Automatic changelog compile [ci skip]
|
2021-07-19 00:23:46 +00:00 |
|
Lin
|
06cd2e3b51
|
Merge pull request #14952 from silicons/why
fixes boxstation line endings
|
2021-07-18 15:26:47 -07:00 |
|
silicons
|
806ecf63ca
|
why
|
2021-07-18 15:16:34 -07:00 |
|
silicons
|
60436f9991
|
???
|
2021-07-18 15:13:23 -07:00 |
|
silicons
|
3070f178e0
|
Merge remote-tracking branch 'citadel/master' into combat_patches_1
|
2021-07-18 15:12:52 -07:00 |
|
CitadelStationBot
|
94dc98ccfa
|
Automatic changelog generation for PR #14946 [ci skip]
|
2021-07-18 17:07:38 -05:00 |
|
silicons
|
bb337b92dd
|
Merge pull request #14946 from timothyteakettle/cow-tail
anthros can now select the cow tail
|
2021-07-18 15:07:36 -07:00 |
|
CitadelStationBot
|
03f8f799bb
|
Automatic changelog generation for PR #14940 [ci skip]
|
2021-07-18 17:07:32 -05:00 |
|
silicons
|
24c2ab8b8c
|
Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
|
2021-07-18 15:07:29 -07:00 |
|
CitadelStationBot
|
ba51785fac
|
Automatic changelog generation for PR #14947 [ci skip]
|
2021-07-18 17:07:14 -05:00 |
|
silicons
|
b0c53fcc57
|
Merge pull request #14947 from Arturlang/crafting_fixes
Crafting menu cleaning up
|
2021-07-18 15:07:12 -07:00 |
|
CitadelStationBot
|
4ebb6fa1ee
|
Automatic changelog generation for PR #14949 [ci skip]
|
2021-07-18 17:07:04 -05:00 |
|
silicons
|
91cdc7c13f
|
Merge pull request #14949 from MrJWhit/oom-fix-port
Port of "[s] Fixes a major memory leak in shuttle code (KILO IS FREE)"
|
2021-07-18 15:07:01 -07:00 |
|
silicons
|
7847f6b69c
|
Merge pull request #14916 from WanderingFox95/WanderingFox95-clearcatsurgeonannouncement
[Ready] Another Cat Surgeon Announcement PR? It's more likely than you think!
|
2021-07-18 15:06:48 -07:00 |
|
CitadelStationBot
|
f858c9380d
|
Automatic changelog generation for PR #14943 [ci skip]
|
2021-07-18 17:06:33 -05:00 |
|
silicons
|
89d0c590e6
|
Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
|
2021-07-18 15:06:30 -07:00 |
|
CitadelStationBot
|
1047af5e27
|
Automatic changelog generation for PR #14926 [ci skip]
|
2021-07-18 17:06:24 -05:00 |
|
silicons
|
5895eb0d31
|
Merge pull request #14926 from YakumoChen/human-leather-hats
Human leather hats
|
2021-07-18 15:06:22 -07:00 |
|
CitadelStationBot
|
f22ad2c795
|
Automatic changelog generation for PR #14930 [ci skip]
|
2021-07-18 17:06:06 -05:00 |
|
silicons
|
093df245b3
|
Merge pull request #14930 from keronshb/mirroromenport
Ports Breaking a mirror now gives you a bad omen
|
2021-07-18 15:06:03 -07:00 |
|
CitadelStationBot
|
ac3198b993
|
Automatic changelog generation for PR #14933 [ci skip]
|
2021-07-18 17:05:50 -05:00 |
|
silicons
|
7cd89978f2
|
Merge pull request #14933 from keronshb/stripdcport
[PORT] Stripping a disconnected player will tell them when they come back (+Lazynull)
|
2021-07-18 15:05:48 -07:00 |
|
CitadelStationBot
|
0b0e4671e7
|
Automatic changelog generation for PR #14941 [ci skip]
|
2021-07-18 17:05:36 -05:00 |
|
silicons
|
9d741fc81c
|
Merge pull request #14941 from SandPoot/vore
Vore additions/update
|
2021-07-18 15:05:33 -07:00 |
|
silicons
|
d9b70b1f1c
|
woo
|
2021-07-18 15:04:30 -07:00 |
|
silicons
|
0df58c878e
|
more
|
2021-07-18 14:01:43 -07:00 |
|
Changelogs
|
344f653669
|
Automatic changelog compile [ci skip]
|
2021-07-18 00:23:58 +00:00 |
|
CitadelStationBot
|
1536939785
|
Automatic changelog generation for PR #14945 [ci skip]
|
2021-07-17 11:50:23 -05:00 |
|
Lin
|
4a7e6e5b00
|
Merge pull request #14945 from timothyteakettle/plant
fixes photosynthesis stopping nutrition going past well fed from non-photosynthesis means
|
2021-07-17 09:50:20 -07:00 |
|
Changelogs
|
7ab9ac6e31
|
Automatic changelog compile [ci skip]
|
2021-07-17 00:23:29 +00:00 |
|
MrJWhit
|
1c1fac3f06
|
Update change_turf.dm
|
2021-07-16 15:10:39 -04:00 |
|
SandPoot
|
b5b033e43e
|
Update bellymodes.dm
oops
|
2021-07-16 15:07:11 -03:00 |
|
Artur
|
5abace9e8c
|
wrong letter and unneceseary variable
|
2021-07-16 15:22:49 +03:00 |
|
CitadelStationBot
|
11e6f0cd87
|
Automatic changelog generation for PR #14944 [ci skip]
|
2021-07-16 00:08:54 -05:00 |
|
Lin
|
a7a6bd96f0
|
Merge pull request #14944 from cadyn/patch-2
Fix tiny oopsies
|
2021-07-15 22:08:51 -07:00 |
|
Changelogs
|
16f1d4d151
|
Automatic changelog compile [ci skip]
|
2021-07-16 00:23:09 +00:00 |
|
Artur
|
b71a6497e8
|
Crafting menu fixes and such
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
|
2021-07-16 03:23:02 +03:00 |
|
SandPoot
|
1a2fe8e364
|
Merge branch 'vore' of https://github.com/SandPoot/Citadel-Station-13 into vore
|
2021-07-15 17:32:31 -03:00 |
|