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

23588 Commits

Author SHA1 Message Date
timothyteakettle
3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01: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
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
Timothy Teakettle
3a894f79d0 less rng reliant this is way better 2020-07-25 19:56:46 +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
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
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01: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
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
timothyteakettle
332dae9ee1 beepsky now replaces THREAT_LEVEL with the threat 2020-07-24 01:31:07 +01: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
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
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
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
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
Lin
02add89513 Merge pull request #12846 from Citadel-Station-13/silicons-patch-42 
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
 2020-07-23 13:29:18 -05:00
Lin
6fca9af0ed Merge pull request #12848 from silicons/morecolors 
species customization now allows 16 million colors instead of 4 thousand
 2020-07-23 13:28:50 -05:00
Iatots
e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
Lin
ddc10e625e Merge pull request #12806 from Citadel-Station-13/silicons-patch-33 
adds some more virtual data returns for gas mixture vv (temp, volume, pressure, heat capacity, energy)
 2020-07-23 13:20:29 -05:00
Lin
7352e21877 Merge pull request #12844 from Citadel-Station-13/silicons-patch-41 
fixes traitor jobban link
 2020-07-23 13:19:25 -05:00
Lin
69c3d4f24a Merge pull request #12864 from Citadel-Station-13/silicons-patch-45 
regarding changelings
 2020-07-23 13:18:55 -05:00
Lin
cdd509479e Merge pull request #12868 from Citadel-Station-13/silicons-patch-46 
regarding manifest injections
 2020-07-23 13:18:35 -05:00