Commit Graph

23193 Commits

Author SHA1 Message Date
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Timothy Teakettle
0bc16c7a37 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-17 22:39:03 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Lin
b6d8167c1e Merge pull request #12760 from Sonic121x/patch-2
Fix Paramedic Jumpsuit
2020-07-14 14:22:17 -05:00
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
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
2be790e8d7 Merge pull request #12736 from Citadel-Station-13/silicons-patch-21
hey let's not have 25% micro borgs going around killing people
2020-07-13 11:51:10 -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
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
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
fbbb5f7ea8 Merge pull request #12678 from Ghommie/Ghommie-cit831
Updating rust-g dependencies to 0.4.4
2020-07-12 08:23:29 -07: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
047a36c973 fix 2020-07-12 05:37:07 -07:00
silicons
72c5c2234e ok 2020-07-12 05:15:55 -07:00
silicons
f99a0564de Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
Trashbag Whitelist Update
2020-07-11 21:28:12 -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
3e5f981825 speed 4 for embeds 2020-07-12 03:17:50 +01:00
timothyteakettle
fbb9fe2d9c better fork 2020-07-12 02:14:50 +01:00
timothyteakettle
8e31e3c534 a tonne of fixes 2020-07-12 01:56:24 +01:00
timothyteakettle
cff2e3d680 never set max amount to 0 2020-07-12 00:58:34 +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
silicons
62df48b2f0 Update robot_upgrades.dm 2020-07-11 15:11:53 -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
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
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
2020-07-11 00:14:47 -07:00
timothyteakettle
e571400b1b lots of bug fixes 2020-07-11 03:35:15 +01:00
Timothy Teakettle
75b9eef74e bug fixes 2020-07-10 22:52:08 +01:00