ea861148b9
Merge pull request #12822 from Citadel-Station-13/silicons-patch-37
...
experimental change (testmerge this!): going from a higher slowdown to a lower slowdown will immediately allow you to move at the lower slowdown
2020-07-27 11:33:04 -05:00
4fad4ad969
Merge pull request #12888 from Citadel-Station-13/silicons-patch-50
...
sorry gamers, no more self healing with a medbeam
2020-07-27 15:27:07 +02:00
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
22efdbffcd
woops
2020-07-26 23:08:41 -07:00
e90671c846
Merge pull request #12927 from Ludox235/we-cant-have-nice-things
...
ZOMBIES. ACT LIKE ONE.
2020-07-26 23:00:33 -07:00
32b8528b16
Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG!
...
Adds tags to applicable clothing, stating the defenses and resistances said clothes have.
2020-07-26 22:59:55 -07:00
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
20d9c74f9f
Merge pull request #12876 from timothyteakettle/species-are-dumb
...
tidies up species files
2020-07-26 22:52:00 -07:00
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
6329b2a760
a
2020-07-26 23:32:36 -04:00
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
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
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
Lin