 Timothy Teakettle
|
75c40f6d93
|
what if wound values didnt suck
|
2020-07-26 18:51:19 +01:00 |
|
|
timothyteakettle
|
3467bf3515
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-07-26 00:25:26 +01:00 |
|
|
CitadelStationBot
|
ee02d70afd
|
Automatic changelog generation for PR #12872 [ci skip]
|
2020-07-25 17:40:18 -05:00 |
|
|
siliconsandGitHub
|
91081ef24c
|
Merge pull request #12872 from Iatots/hairball
Adds depth to the lick wounds mechanic.
|
2020-07-25 15:40:15 -07:00 |
|
|
Timothy Teakettle
|
c1932be528
|
last second edit woops
|
2020-07-25 21:53:11 +01:00 |
|
|
Timothy Teakettle
|
8b2a92994f
|
less rng reliance
|
2020-07-25 20:14:41 +01:00 |
|
|
CitadelStationBot
|
49f0a765a0
|
Automatic changelog generation for PR #12877 [ci skip]
|
2020-07-25 14:08:11 -05:00 |
|
|
siliconsandGitHub
|
774bceb266
|
Merge pull request #12877 from dapnee/meta-dab
What if Meta Arrivals Weren't An Eye Sore?
|
2020-07-25 12:08:08 -07:00 |
|
|
Timothy Teakettle
|
3a894f79d0
|
less rng reliant this is way better
|
2020-07-25 19:56:46 +01:00 |
|
|
CitadelStationBot
|
8a360db492
|
Automatic changelog generation for PR #12909 [ci skip]
|
2020-07-25 13:31:13 -05:00 |
|
|
LinandGitHub
|
892053e3d9
|
Merge pull request #12909 from DeltaFire15/death-machine-broke
[FUCK] Fixes organ decay
|
2020-07-25 13:31:10 -05:00 |
|
|
Timothy Teakettle
|
4d397bd8ae
|
Merge branch 'wounds-part-2' of https://github.com/timothyteakettle/Citadel-Station-13 into wounds-part-2
|
2020-07-25 18:15:19 +01:00 |
|
|
Timothy Teakettle
|
4f7ea622d6
|
hey this is important
|
2020-07-25 18:15:05 +01:00 |
|
|
DeltaFire
|
db823ac16c
|
fixes the organ bitfields
|
2020-07-25 19:13:08 +02:00 |
|
|
timothyteakettle
|
e18bfb41b7
|
woopsy
|
2020-07-25 02:16:39 +01:00 |
|
|
timothyteakettle
|
b708be60e9
|
hey look ma i removed a space
|
2020-07-25 02:12:21 +01:00 |
|
|
timothyteakettle
|
c4a1019059
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-07-25 02:03:01 +01:00 |
|
|
timothyteakettle
|
697301ad53
|
error fixies?
|
2020-07-25 01:26:54 +01:00 |
|
|
Changelogs
|
571beb24b0
|
Automatic changelog compile [ci skip]
|
2020-07-25 00:11:03 +00:00 |
|
|
timothyteakettle
|
2a3f45f7af
|
fixes
|
2020-07-25 01:10:12 +01:00 |
|
|
timothyteakettle
|
3ca098fe98
|
bugfixes
|
2020-07-25 00:22:24 +01:00 |
|
|
timothyteakettle
|
315e7e1f99
|
bugfixes
|
2020-07-24 23:49:15 +01:00 |
|
|
timothyteakettle
|
59f949018c
|
Merge branch 'master' into wounds-part-2
|
2020-07-24 23:45:20 +01:00 |
|
|
timothyteakettle
|
8360bb1a7f
|
section 2
|
2020-07-24 23:44:57 +01:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
IatotsandGitHub
|
a31e160227
|
this return stone keeps the null tigers away
|
2020-07-24 16:06:35 +02:00 |
|
|
|
b6437a4ada
|
Update code/game/objects/items/plushes.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2020-07-24 15:23:11 +02:00 |
|
|
|
83c6dc65ba
|
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2020-07-24 15:22:56 +02:00 |
|
|
|
2eade6c149
|
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2020-07-24 15:22:38 +02:00 |
|
|
IatotsandGitHub
|
a9c51fc624
|
Update other_reagents.dm
|
2020-07-24 08:40:48 +02:00 |
|
|
IatotsandGitHub
|
ec2bd9b876
|
Update plushes.dm
|
2020-07-24 08:40:25 +02:00 |
|
|
IatotsandGitHub
|
f53f7c5e92
|
Update cuts.dm
|
2020-07-24 07:46:09 +02:00 |
|
|
CitadelStationBot
|
a88fa29682
|
Automatic changelog generation for PR #12879 [ci skip]
|
2020-07-23 20:12:01 -05:00 |
|
|
nik707andGitHub
|
6117b7d81e
|
Merge pull request #12879 from timothyteakettle/let-bots-wear-hats
beepsky replaces THREAT_LEVEL with the actual threat
|
2020-07-23 20:11:57 -05:00 |
|
|
timothyteakettle
|
adc4c76be7
|
fix
|
2020-07-24 02:00:22 +01:00 |
|
|
CitadelStationBot
|
3fe1690f44
|
Automatic changelog generation for PR #12880 [ci skip]
|
2020-07-23 19:46:42 -05:00 |
|
|
nik707andGitHub
|
5a2a2d69ae
|
Merge pull request #12880 from CameronWoof/aloe-icon
Gives aloe an item icon
|
2020-07-23 19:46:39 -05:00 |
|
|
CameronWoof
|
68d46e5f0d
|
gives aloe an item icon
|
2020-07-23 17:41:08 -07:00 |
|
|
timothyteakettle
|
332dae9ee1
|
beepsky now replaces THREAT_LEVEL with the threat
|
2020-07-24 01:31:07 +01:00 |
|
|
Changelogs
|
5683013907
|
Automatic changelog compile [ci skip]
|
2020-07-24 00:10:34 +00:00 |
|
|
CitadelStationBot
|
e0915621a8
|
Automatic changelog generation for PR #12878 [ci skip]
|
2020-07-23 18:20:09 -05:00 |
|
|
siliconsandGitHub
|
5182f8e49a
|
Merge pull request #12878 from Citadel-Station-13/Linzolle-patch-1
maybe you should be able to see wound descriptions
|
2020-07-23 16:20:05 -07:00 |
|
|
CitadelStationBot
|
30a6ddd963
|
Automatic changelog generation for PR #12857 [ci skip]
|
2020-07-23 18:18:20 -05:00 |
|
|
siliconsandGitHub
|
d946998fb9
|
Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
|
2020-07-23 16:18:17 -07:00 |
|
|
LinandGitHub
|
a655502d9a
|
tabs!
|
2020-07-23 22:58:00 +00:00 |
|
|
dapnee
|
6f0860d1d3
|
What if Meta Arrivals Weren't An Eye Sore?
Whack of you to assume this is kosher to make arrivals look like shit like that.
|
2020-07-23 16:36:54 -06:00 |
|
|
LinandGitHub
|
8a25582c1c
|
Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
|
2020-07-23 17:13:48 -05:00 |
|
|
LinandGitHub
|
8be94f2ef0
|
Merge pull request #12873 from silicons/FUCK
FUCK - rewrites sanitize_hexcolor to support converting from RGB to RRGGBB
|
2020-07-23 16:22:39 -05:00 |
|
|
silicons
|
03f0d76a8e
|
yeah ok
|
2020-07-23 13:23:45 -07:00 |
|
|
silicons
|
6db18f2a53
|
Merge remote-tracking branch 'citadel/master' into FUCK
|
2020-07-23 12:59:30 -07:00 |
|