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

23610 Commits

Author SHA1 Message Date
BlackMajor
5e3cb62790 Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom 
removes zoomba/roomba borg sprites
 2020-07-27 13:00:17 +12:00
silicons
b5e21e5555 Merge pull request #12896 from timothyteakettle/jar-fixes 
makes some small tweaks to pet carriers / bluespace jars
 2020-07-26 17:21:28 -07:00
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
Hatterhat
aabb60b5c5 shit damn boys its another fucking day 2020-07-26 17:42:24 -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
ea737d63dd Merge pull request #12904 from Citadel-Station-13/silicons-patch-54 
proper fix for every borg being able to have mops, but doesn't remove the upgrade entirely
 2020-07-26 17:22:47 -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
6bf53859d2 wow maybe i should make it compile first 2020-07-26 14:42:45 -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
Hatterhat
bf273cffdd burnt bokken backsprite, wound tweak 2020-07-25 16:18:26 -05:00
silicons
75213ceef2 Update LINDA_turf_tile.dm 2020-07-25 13:58:38 -07:00
Hatterhat
fa5fd08be3 parry tweaks 2020-07-25 15:37:21 -05:00
Timothy Teakettle
76016c75f9 yes 2020-07-25 21:27:32 +01:00
Hatterhat
b9ce2e497d bare wound bonus, wound malus 2020-07-25 13:10:35 -05:00
Hatterhat
f28c98590a lowered parry windows! attack verbs! 2020-07-25 13:03:15 -05:00
DeltaFire
db823ac16c fixes the organ bitfields 2020-07-25 19:13:08 +02:00
Hatterhat
eb6cb1151c i forgot the actual defining feature 2020-07-25 06:59:31 -05:00
silicons
d8a91d9ffa Update robot_upgrades.dm 2020-07-25 02:35:53 -07:00
Sishen
04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
Hatterhat
47d63296d0 slight buff? may be overreaching 2020-07-25 00:09:53 -05:00
silicons
4d83060ba1 Update clothing.dm 2020-07-24 19:29:29 -07:00
timothyteakettle
47998153cd tweaks 2020-07-25 03:25:28 +01: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
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
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
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