Commit Graph

16711 Commits

Author SHA1 Message Date
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
timothyteakettle 28bf5d2344 remove c 2020-07-26 23:15:56 +01: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
Timothy Teakettle 36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
Timothy Teakettle 75c40f6d93 what if wound values didnt suck 2020-07-26 18:51:19 +01: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
timothyteakettle 3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01: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
Timothy Teakettle c1932be528 last second edit woops 2020-07-25 21:53:11 +01:00
Keate Senior 01c31c1ce4 My illiteracy knows no bounds 2020-07-25 15:31:26 -04:00
Timothy Teakettle 8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
Timothy Teakettle 3a894f79d0 less rng reliant this is way better 2020-07-25 19:56:46 +01:00
Sishen 04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
Sishen 42b6944761 Update internal_affairs.dm 2020-07-25 01:54:58 -06:00
Sishen 1939d44478 removes a lot of shit from IAA 2020-07-25 01:05:38 -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 e18bfb41b7 woopsy 2020-07-25 02:16:39 +01:00
timothyteakettle e273d327bd yeah 2020-07-25 01:11:04 +01:00
timothyteakettle 3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle 315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +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