Commit Graph

15705 Commits

Author SHA1 Message Date
silicons c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
Timothy Teakettle 8de062adbb fix 2020-07-13 19:46:51 +01:00
zerothebigboy 3ccd994080 a 2020-07-13 13:52:56 -04:00
Lin 004c00325f Merge pull request #12747 from Citadel-Station-13/silicons-patch-24
refactors circuit screens a bit, no more messages coming out of the floor
2020-07-13 12:22:58 -05:00
Lin 55c4e40fbb Merge pull request #12706 from silicons/records
adds security/medical records to character setup
2020-07-13 11:50:02 -05:00
Lin e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes
removing vog's ability to commit sin, probably
2020-07-13 11:31:25 -05:00
Lin ba4a77fc30 Merge pull request #12737 from Citadel-Station-13/silicons-patch-22
hey can we not have circuit fusion bombs
2020-07-13 11:29:23 -05:00
Lin 1b3112528c Merge pull request #12746 from silicons/react
chemical reactions now have priority - "the first grenade helped with the revenant and the second blew up the evacuation shuttle"
2020-07-13 11:28:52 -05:00
Artur 732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur d1b3990875 Fixed scanner export 2020-07-13 16:20:21 +03:00
Sonic121x b128a21309 Paramedic jump suit adjust
paramedic jump suit now adjust able.
light version of paramedic jump suit now have a digitigrade version
2020-07-13 20:33:59 +08:00
YakumoChen 072b4b673f set hierophant friendly fire to on by default 2020-07-13 09:40:58 +00:00
Winter Flare d7f5de97da Oops. 2020-07-12 22:34:32 -04:00
Winter Flare 20cc3cad55 re-add bitesize. 2020-07-12 22:15:06 -04:00
Winter Flare 351d1748fc Updates some comments. 2020-07-12 22:05:08 -04:00
Timothy Teakettle 29628dd82a cows 2020-07-12 21:40:16 +01:00
Timothy Teakettle c0687886e4 using initial is better practice 2020-07-12 21:38:09 +01:00
Linzolle 8f578da614 PLS NO PREF BREAK 2020-07-12 14:32:19 -05:00
Timothy Teakettle 0705130448 small edgecase 2020-07-12 17:31:37 +01:00
silicons 6bf209d9a5 Update output.dm 2020-07-12 06:56:48 -07:00
silicons d9a7e860dd Update output.dm 2020-07-12 06:13:19 -07:00
silicons b94c1ab709 Update output.dm 2020-07-12 06:10:26 -07:00
silicons 72c5c2234e ok 2020-07-12 05:15:55 -07:00
silicons f7b476bc64 Update preferences.dm 2020-07-11 21:23:06 -07:00
Hatterhat eb0e0b6cbd i may not test my shit but at least i can have less line changes motherfucker 2020-07-11 23:18:17 -05:00
timothyteakettle 8e31e3c534 a tonne of fixes 2020-07-12 01:56:24 +01:00
timothyteakettle ab01a69c1f bugfix 2020-07-12 00:53:31 +01:00
timothyteakettle 8712dd6de4 bugfixes 2020-07-12 00:31:45 +01:00
Timothy Teakettle c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons 4b30198354 Update reagents.dm 2020-07-11 15:15:30 -07:00
Lin 955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
2020-07-11 16:40:38 -05:00
Lin e87653f781 Merge pull request #12594 from Citadel-Station-13/silicons-patch-3
what if you could override the entire say verb/emphasis system to audibly emote with ! like in baycode servers
2020-07-11 16:00:39 -05:00
Lin a75dd1d8f3 Merge pull request #12729 from Citadel-Station-13/silicons-patch-20
whooshing now happens at pressure difference * 2.5% probability instead of people hearing space wind from someone exhaling next to them
2020-07-11 15:47:03 -05:00
Lin c9c8285603 Merge pull request #12723 from silicons/atmos_555
atmos microoptimizations
2020-07-11 15:44:19 -05:00
silicons 6fbe083e13 ok 2020-07-11 07:03:41 -07:00
silicons 98e727ec03 ok 2020-07-11 00:55:23 -07:00
silicons 926f64e13d Merge pull request #12722 from kappa-sama/patch-31
lowers wisdom cow's spawnrate to standard and makes it 66% less spammy
2020-07-11 00:49:29 -07:00
silicons 00867c064c Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals
Drinkable and Sell-able Telecrystals
2020-07-11 00:49:15 -07:00
silicons feddd14176 Merge pull request #12714 from DeltaFire15/sents-compromise-aug
Fixes / Buffs sentinels compromise to heal augmented bodyparts aswell.
2020-07-11 00:48:37 -07:00
silicons 08a6ef88e3 Merge pull request #12711 from LetterN/nerfs-cats
[s] Updates goonchat [ready]
2020-07-11 00:46:32 -07:00
silicons f33782aa38 Merge pull request #12716 from LetterN/d-w-
Adds more emojis
2020-07-11 00:45:39 -07:00
silicons 36ba62652b Merge pull request #12717 from YakumoChen/wedding-crate
Wedding crate
2020-07-11 00:44:50 -07:00
silicons cc2e9530b1 fix 2020-07-11 00:44:17 -07:00
silicons ed847b1a58 compile 2020-07-11 00:42:13 -07:00
silicons 3d80792e79 more 2020-07-11 00:37:56 -07:00
silicons 8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
silicons 4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
2020-07-11 00:14:47 -07:00
The0bserver db625eb93f Initial Commit: Adds slimeball recipe 2020-07-10 23:04:25 -04:00
timothyteakettle e571400b1b lots of bug fixes 2020-07-11 03:35:15 +01:00