Commit Graph

15727 Commits

Author SHA1 Message Date
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
308c52df00 ok 2020-07-26 17:14:38 -07:00
silicons
0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons
349874e512 haha 2020-07-26 16:49:47 -07:00
silicons
3ee5611b1d Update living_active_block.dm 2020-07-26 16:19:43 -07:00
silicons
cebd21696f Update living_active_parry.dm 2020-07-26 16:18:12 -07:00
silicons
bf4b2dfbf5 ok 2020-07-26 15:59:56 -07:00
DeltaFire
53482e6bd6 modifies the ark, aswell as changing a tiny bit of stuff for stable gateways
The ark no longer immediately activates when summoned. Instead, an cultist needs to activate it. Once on, it cannot be turned off again save by destroying it.

Also, the stable-gateway deactivation doafter now has an actual beam-animation.
2020-07-27 00:52:35 +02: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
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
Ludox
fee4dd6d14 ZOMBIES. ACT LIKE ONE.
This is why we can't have nice things in life.
2020-07-27 00:16:31 +02:00
silicons
49070d732b ohhhhhhh boy 2020-07-26 15:10:08 -07:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
SiliconMain
63bb9fe0f3 the dangers of copypaste 2020-07-26 16:35:50 -05:00
DeltaFire
93672ea1e4 modifies the ark to not immediately activate and purges some todos
Tin
2020-07-26 23:00:29 +02:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05:00
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
The0bserver
129297dfa5 this commit intentionally left blank 2 2020-07-26 10:06:35 -04:00
The0bserver
556fedacd0 this commit intentionally left blank 2020-07-26 09:56:46 -04:00
The0bserver
dd16a509f2 Initial Commit: MIGHT add tags 2020-07-26 09:18:32 -04:00
Keate Senior
5fb64c38e8 Makes the god fight cooler by adding new quotes and some sound changes 2020-07-26 03:58:52 -04:00
Keate Senior
7fd93ecd7d description edits/Ratvar calling you out for trying to make another Ark
makes the Ark's description fit for a station based setting, and makes Ratvar have a nicer tone when talking to someone trying to summon another ark after he's spawned already
2020-07-26 03:57:32 -04:00
Keate Senior
49b97f2ea2 increases the penalty for off-station scripture recital to x3 cost/time 2020-07-26 03:54:22 -04:00
Keate Senior
f2ef4def24 Buffs some of the available scriptures for clock cult borgs
engineering borgs get a focus on the structures
combat oriented borgs get more combat spells IE: belligerent and volt blaster
mediborgs get mending mantra
comments out the janitor slab things, to mirror the janiborg being commented out
2020-07-26 03:52:35 -04:00
silicons
389a54590e fix 2020-07-26 00:32:14 -07:00
silicons
829403a2ac Update say.dm 2020-07-25 23:52:15 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
e2a7064c10 Update say.dm 2020-07-25 23:40:39 -07:00
silicons
2a29f73ac8 ok 2020-07-25 17:34:12 -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
silicons
75213ceef2 Update LINDA_turf_tile.dm 2020-07-25 13:58:38 -07:00
Keate Senior
01c31c1ce4 My illiteracy knows no bounds 2020-07-25 15:31:26 -04: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
silicons
23465355d0 Update stun.dm 2020-07-24 22:16:06 -07:00
silicons
44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
silicons
33d5ba788b aight 2020-07-24 20:19:18 -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
Keate Senior
18bdf83136 God I hate travis, will this appease you? 2020-07-24 14:47:53 -04:00
Keate Senior
8473a0291d Revert "/probably/ gets Travis to stop shouting about guardians"
This reverts commit be9723678e.
2020-07-24 12:05:50 -04:00