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

23637 Commits

Author SHA1 Message Date
silicons
850bc0dc33 Merge pull request #12919 from SiliconMain/patch-5 
Dura belt tweaks
 2020-07-26 22:58:31 -07:00
silicons
16a77f9641 Merge pull request #12918 from SiliconMain/patch-3 
Minor paramed edit
 2020-07-26 22:57:58 -07:00
silicons
401e8cf967 Merge pull request #12901 from CameronWoof/trumpet-cargo 
Adds spaceman's trumpet seeds to the exotic seeds crate
 2020-07-26 22:56:59 -07:00
silicons
d47b553527 Merge pull request #12892 from Literallynotpickles/hi 
Reverts extinguishers into being alt-clickable
 2020-07-26 22:56:22 -07:00
silicons
e240453044 Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit 
fixes a dumb bug to do with material crafting
 2020-07-26 22:52:30 -07:00
silicons
20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb 
tidies up species files
 2020-07-26 22:52:00 -07:00
silicons
67c002de7a Merge pull request #12817 from kappa-sama/patch-34 
boosts stimpak cost back up to 5 from 3
 2020-07-26 22:51:24 -07:00
BlackMajor
dd6fefa43e Merge pull request #12917 from Citadel-Station-13/silicons-patch-57 
FIXES. STUNBATONS. FOR. THE LAST. TIME - WINGET IS A SLEEP() AND NO ONE REALIZED THAT MAKING BATONS MAKE PEOPLE -GLORF WOULD MAKE THEM BREAK UNDER LAG
 2020-07-27 13:20:38 +12:00
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
SiliconMain
1a78098885 on second thought 2020-07-26 05:20:53 -05:00
SiliconMain
54ed22d17d ye 2020-07-26 05:19:56 -05:00
SiliconMain
d1c3465d77 Update belt.dm 2020-07-26 04:28:18 -05:00
SiliconMain
8f1a8adcfd Update negative.dm 2020-07-26 04:15:39 -05:00
silicons
829403a2ac Update say.dm 2020-07-25 23:52:15 -07:00
silicons
e2a7064c10 Update say.dm 2020-07-25 23:40:39 -07: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
Timothy Teakettle
238af723bb makes insects specifically insects not flies 2020-07-25 18:14:12 +01: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
CameronWoof
df7a1f2b8d adds spaceman's trumpet seeds to the exotic seeds crate 2020-07-24 23:08:36 -07: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
Suicidalpickles
229500aa0e reverts extinguishers to altclick emptying 
h
 2020-07-24 16:00:36 -07: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