shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,902 Commits 5 Branches 0 Tags
f1c242aadccb8c3aebc66b4e5cfada69a0dc4ec7
Commit Graph

35902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie
f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
Changelogs
05ee056f25 Automatic changelog compile [ci skip] 2020-07-26 00:10:51 +00:00
CitadelStationBot
ee02d70afd Automatic changelog generation for PR #12872 [ci skip] 2020-07-25 17:40:18 -05:00
silicons
91081ef24c Merge pull request #12872 from Iatots/hairball 
Adds depth to the lick wounds mechanic.
 2020-07-25 15:40:15 -07:00
CitadelStationBot
49f0a765a0 Automatic changelog generation for PR #12877 [ci skip] 2020-07-25 14:08:11 -05:00
silicons
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
CitadelStationBot
8a360db492 Automatic changelog generation for PR #12909 [ci skip] 2020-07-25 13:31:13 -05:00
Lin
892053e3d9 Merge pull request #12909 from DeltaFire15/death-machine-broke 
[FUCK] Fixes organ decay
 2020-07-25 13:31:10 -05:00
DeltaFire
db823ac16c fixes the organ bitfields 2020-07-25 19:13:08 +02:00
Changelogs
571beb24b0 Automatic changelog compile [ci skip] 2020-07-25 00:11:03 +00:00
Iatots
a31e160227 this return stone keeps the null tigers away 2020-07-24 16:06:35 +02:00
Iatots
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
Iatots
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
Iatots
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
Iatots
a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
Iatots
ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
Iatots
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
nik707
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
nik707
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
silicons
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
silicons
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
Lin
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
Lin
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
Lin
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
silicons
cbe0cad1a4 fix 2020-07-23 12:41:33 -07:00
Iatots
4da365851f up to regulations now. 2020-07-23 21:27:00 +02:00
silicons
758d746e96 compile 2020-07-23 12:25:02 -07:00
silicons
59bd63471e sigh 2020-07-23 12:23:13 -07:00
silicons
5d7dfd327c FUCK 2020-07-23 12:22:55 -07:00
Iatots
21ef5fb1b7 Update other_reagents.dm 2020-07-23 21:14:46 +02:00
Iatots
b2a0d00eee Update plushes.dm 2020-07-23 21:13:41 +02:00
Iatots
554e764be8 Update cuts.dm 
dang speededit
 2020-07-23 21:00:26 +02:00
Iatots
a2381755e1 Update cuts.dm 
nomenclature error
 2020-07-23 20:52:29 +02:00
Lin
e14f5ff576 Merge pull request #12832 from Citadel-Station-13/overlays-experimental 
do we want (probably) free memory savings trick question yes we do
 2020-07-23 13:41:36 -05:00
CitadelStationBot
464402ec6d Automatic changelog generation for PR #12821 [ci skip] 2020-07-23 13:41:20 -05:00
Lin
1f7488aad2 Merge pull request #12821 from Citadel-Station-13/silicons-patch-36 
Increases projectile speed across the board by around 40-45%
 2020-07-23 13:41:17 -05:00
Timothy Teakettle
e4f0a84404 cut overlay 2020-07-23 19:33:26 +01:00
Lin
fbfd6286b5 Merge pull request #12849 from Citadel-Station-13/silicons-patch-43 
raises max keybind command length to 32 so controller users don't get kicked
 2020-07-23 13:30:31 -05:00
Lin
d112e00c11 Merge pull request #12837 from silicons/apcs 
see unoptimized code doesn't matter much until iceboxstation rolls and now said unoptimized code is looping across probably a few tens of thousands of objects and now we have a problem
 2020-07-23 13:30:00 -05:00