308c52df00
ok
2020-07-26 17:14:38 -07:00
0b17c761e7
whew
2020-07-26 17:11:23 -07:00
349874e512
haha
2020-07-26 16:49:47 -07:00
3ee5611b1d
Update living_active_block.dm
2020-07-26 16:19:43 -07:00
cebd21696f
Update living_active_parry.dm
2020-07-26 16:18:12 -07:00
bf4b2dfbf5
ok
2020-07-26 15:59:56 -07:00
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
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
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
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
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
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
4b56dc65af
Merge pull request #12897 from Citadel-Station-13/silicons-patch-51
...
fixes clothes repairs
2020-07-26 17:24:21 -05:00
b3722d0a43
Merge pull request #12913 from Citadel-Station-13/silicons-patch-55
...
atmos microoptimizations
2020-07-26 17:22:03 -05:00
fee4dd6d14
ZOMBIES. ACT LIKE ONE.
...
This is why we can't have nice things in life.
2020-07-27 00:16:31 +02:00
49070d732b
ohhhhhhh boy
2020-07-26 15:10:08 -07:00
7d7f40ce90
fixes
2020-07-26 14:56:03 -07:00
63bb9fe0f3
the dangers of copypaste
2020-07-26 16:35:50 -05:00
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
af08e8a37f
altclick for fucked up parries! also bugfixes
2020-07-26 13:02:56 -05:00
129297dfa5
this commit intentionally left blank 2
2020-07-26 10:06:35 -04:00
556fedacd0
this commit intentionally left blank
2020-07-26 09:56:46 -04:00
dd16a509f2
Initial Commit: MIGHT add tags
2020-07-26 09:18:32 -04:00
389a54590e
fix
2020-07-26 00:32:14 -07:00
829403a2ac
Update say.dm
2020-07-25 23:52:15 -07:00
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
e2a7064c10
Update say.dm
2020-07-25 23:40:39 -07:00
2a29f73ac8
ok
2020-07-25 17:34:12 -07:00
91081ef24c
Merge pull request #12872 from Iatots/hairball
...
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
ad5f47ea8f
Update scanner.dm
2020-07-25 15:29:44 -07:00
75213ceef2
Update LINDA_turf_tile.dm
2020-07-25 13:58:38 -07:00
04feb3c4a5
borg
2020-07-25 03:22:48 -06:00
df7a1f2b8d
adds spaceman's trumpet seeds to the exotic seeds crate
2020-07-24 23:08:36 -07:00
23465355d0
Update stun.dm
2020-07-24 22:16:06 -07:00
44d3a0aa27
fixes
2020-07-24 20:37:02 -07:00
33d5ba788b
aight
2020-07-24 20:19:18 -07:00
4d83060ba1
Update clothing.dm
2020-07-24 19:29:29 -07:00
14fba6a056
funny parry sticks
2020-07-24 21:19:01 -05:00
e273d327bd
yeah
2020-07-25 01:11:04 +01:00
a31e160227
this return stone keeps the null tigers away
2020-07-24 16:06:35 +02:00
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
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
1c4249c99d
Update medbeam.dm
2020-07-24 00:57:30 -07:00
a9c51fc624
Update other_reagents.dm
2020-07-24 08:40:48 +02:00
060b3dcd04
im sorry moths
2020-07-24 03:27:44 +01:00
aabe3c3b32
Update emitter.dm
2020-07-23 18:52:39 -07:00
bb32f183ff
Update weaponized.dm
2020-07-23 18:52:35 -07:00
f47a7449e3
Update gun.dm
2020-07-23 18:52:23 -07:00
0b4185e26f
Update beam_rifle.dm
2020-07-23 18:52:18 -07:00
ce18584fb1
Update beam_rifle.dm
2020-07-23 18:47:22 -07:00
silicons