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

15549 Commits

Author SHA1 Message Date
silicons
e13b6d36da Merge pull request #12895 from Hatterhat/bokken 
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
 2020-07-26 15:52:35 -07:00
Lin
8aa20d10b8 Merge pull request #12863 from Citadel-Station-13/clownops 
clown mobss are now allied to each other and clownops are now allied to clown mobs
 2020-07-26 17:51:00 -05:00
Lin
6514fced3c Merge pull request #12893 from timothyteakettle/picklefix 
pickles don't die until their contents is released
 2020-07-26 17:27:23 -05:00
Lin
c36bf1b5ed Merge pull request #12871 from Citadel-Station-13/silicons-patch-47 
ports some tg changes to make clients properly garbage collect
 2020-07-26 17:26:38 -05:00
Lin
6b12563abe Merge pull request #12881 from Citadel-Station-13/silicons-patch-48 
since it's a little hard to fix the actual issue let's just make the projectile safety check that's causing stuff to freeze when something goes wrong more lenient so things don't freeze and people don't think anything is wrong
 2020-07-26 17:26:19 -05:00
Lin
04b6d854f8 Merge pull request #12914 from Citadel-Station-13/silicons-patch-56 
forensic scanners no longer pick up color in blood dna
 2020-07-26 17:24:33 -05:00
Lin
4b56dc65af Merge pull request #12897 from Citadel-Station-13/silicons-patch-51 
fixes clothes repairs
 2020-07-26 17:24:21 -05:00
Lin
b3722d0a43 Merge pull request #12913 from Citadel-Station-13/silicons-patch-55 
atmos microoptimizations
 2020-07-26 17:22:03 -05:00
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -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
silicons
ad5f47ea8f Update scanner.dm 2020-07-25 15:29:44 -07:00
silicons
75213ceef2 Update LINDA_turf_tile.dm 2020-07-25 13:58:38 -07:00
silicons
4d83060ba1 Update clothing.dm 2020-07-24 19:29:29 -07:00
Hatterhat
14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
timothyteakettle
e273d327bd yeah 2020-07-25 01:11:04 +01:00
Iatots
a31e160227 this return stone keeps the null tigers away 2020-07-24 16:06:35 +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
silicons
99737b6e11 Update projectile.dm 2020-07-23 18:35:32 -07: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
Iatots
4da365851f up to regulations now. 2020-07-23 21:27:00 +02:00
Iatots
21ef5fb1b7 Update other_reagents.dm 2020-07-23 21:14:46 +02: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
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
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
Timothy Teakettle
5463673831 fuck 2020-07-23 19:02:50 +01:00
Iatots
967dfb7bc4 Update other_reagents.dm 2020-07-23 19:59:08 +02:00
Timothy Teakettle
673188bc7e please show the hat 2020-07-23 18:57:24 +01:00
Timothy Teakettle
b18356c95d requested changes 2020-07-23 18:47:34 +01:00
silicons
9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20 
Ports several food sprites/foods from Baystation/Citadel RP
 2020-07-23 10:35:30 -07:00
silicons
ec72015f4f Merge pull request #12809 from BlackMajor/borgo 
Gripper brained. The medborg can do chemistry now, oh no.
 2020-07-23 10:35:16 -07:00
silicons
55754023ba Update gas_mixture.dm 2020-07-23 10:32:21 -07:00
silicons
dad3d38933 Merge pull request #12869 from timothyteakettle/zombies-rework 
the very much needed zombie buffs
 2020-07-23 10:29:43 -07:00
silicons
aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto 
Allows Photos to be Burned
 2020-07-23 10:29:10 -07:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
silicons
8a9d806d04 Update client_procs.dm 2020-07-23 08:12:48 -07:00