Commit Graph

39926 Commits

Author SHA1 Message Date
zeroisthebiggay 3f36b95f92 a
a
2020-12-23 09:42:10 -05:00
zerothebigboy dcecd6f03a pogbox 2020-12-21 18:28:52 -05:00
zerothebigboy cca8dc3a36 pogbox 2020-12-21 18:25:33 -05:00
zerothebigboy 05759d3be3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-21 18:09:18 -05:00
zerothebigboy 57a13a1bf1 a 2020-12-21 18:08:56 -05:00
CitadelStationBot b716658820 Automatic changelog generation for PR #13819 [ci skip] 2020-12-21 11:30:16 -06:00
silicons 901fcddf44 Merge pull request #13819 from Hatterhat/surv-dag-buf
survival dagger light fix + butchery buff
2020-12-21 10:30:13 -07:00
BlackMajor ce3cfca619 Merge pull request #13824 from silicons/LF
LF
2020-12-21 14:57:40 +13:00
silicons ea21151462 LF 2020-12-20 18:55:45 -07:00
CitadelStationBot 8a3ac13be2 Automatic changelog generation for PR #13814 [ci skip] 2020-12-20 19:20:35 -06:00
DeltaFire 8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath
Fixes twin sword sheaths icon/item state from being blank sprites
2020-12-21 02:20:32 +01:00
Xantholne 1c968e6ebe period equals 2020-12-20 16:00:18 -07:00
CitadelStationBot 7a5f47776a Automatic changelog generation for PR #13785 [ci skip] 2020-12-20 16:42:07 -06:00
silicons db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag
Makes grab bag ONLY make station antags; triples alien dynamic threat.
2020-12-20 15:42:04 -07:00
Lin 36a94c97e0 Merge pull request #13802 from Citadel-Station-13/silicons-patch-29
bandaid fixes meteors not spawning properly due to off by 1 error with zlevel transition
2020-12-20 18:27:47 +00:00
CitadelStationBot f4e6dfc644 Automatic changelog generation for PR #13755 [ci skip] 2020-12-20 12:14:51 -06:00
Lin 3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
CitadelStationBot 52fd9b23ae Automatic changelog generation for PR #13774 [ci skip] 2020-12-20 11:34:32 -06:00
silicons 7b1b633b21 Merge pull request #13774 from keronshb/Clowncar
Clown Car The Honkening
2020-12-20 10:34:29 -07:00
CitadelStationBot 80c5f42bcb Automatic changelog generation for PR #13801 [ci skip] 2020-12-20 11:34:24 -06:00
silicons 11aad4e6db Merge pull request #13801 from SandPoot/master
Makes limb grower better
2020-12-20 10:34:21 -07:00
CitadelStationBot 6ee3fd0c4e Automatic changelog generation for PR #13809 [ci skip] 2020-12-20 11:34:09 -06:00
silicons e87bcb8aa1 Merge pull request #13809 from Putnam3145/harness-tweak-2
Makes gear harness cover nothing
2020-12-20 10:34:06 -07:00
CitadelStationBot 5e8cde2f16 Automatic changelog generation for PR #13811 [ci skip] 2020-12-20 11:33:48 -06:00
silicons 8aafad611a Merge pull request #13811 from BlackMajor/borg-hypo
Prevents borg hypos from injecting if it would OD the target while on help intent
2020-12-20 10:33:45 -07:00
CitadelStationBot 70b70a9da4 Automatic changelog generation for PR #13776 [ci skip] 2020-12-20 11:22:09 -06:00
Lin f6a6c138df Merge pull request #13776 from DeltaFire15/ai-kill-once
Makes Traitor AIs have 'kill once' objectives instead of 'assassinate'
2020-12-20 17:22:06 +00:00
CitadelStationBot 3cfd43834f Automatic changelog generation for PR #13799 [ci skip] 2020-12-20 11:21:40 -06:00
Lin a0eb6a9b5d Merge pull request #13799 from Citadel-Station-13/silicons-patch-28
fixes space ninjas being able to hardstun with their gloves
2020-12-20 17:21:37 +00:00
Lin caed4b51b9 Merge pull request #13756 from silicons/tgui_db
gives citadel main its own tgui db id to avoid issues but this time i actually don't webedit so i can recompile tgui
2020-12-20 17:12:12 +00:00
DeltaFire e5eff3b028 Merge pull request #13792 from Citadel-Station-13/silicons-patch-25
fixes TEG circulators not being movable when unanchored
2020-12-20 18:11:33 +01:00
CitadelStationBot 226bc97b1a Automatic changelog generation for PR #13813 [ci skip] 2020-12-20 11:10:57 -06:00
DeltaFire 24b7ef93fe Merge pull request #13813 from Citadel-Station-13/loudmode
nerfs loudmode headsets from 160% to 120% fontsize
2020-12-20 18:10:53 +01:00
CitadelStationBot e215a074ad Automatic changelog generation for PR #13796 [ci skip] 2020-12-20 10:23:23 -06:00
silicons 34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Putnam 4e6abdec74 i wish we both die 2020-12-19 20:51:58 -08:00
Putnam f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam a3f2ae3333 i'm such an idiot. 2020-12-19 20:27:07 -08:00
Putnam c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option.
why didn't i do this sooner
2020-12-19 19:30:16 -08:00
Putnam 79e71b54e2 Made gear harness adjustable instead of none-cover by default. 2020-12-19 19:01:31 -08:00
Putnam f840965763 no autotraitor, better logging 2020-12-19 18:04:22 -08:00
silicons 6416921560 raise 2020-12-19 18:59:35 -07:00
Hatterhat fa799a0ac5 it compiles 2020-12-19 19:02:56 -06:00
Hatterhat b8b2f34735 funny knife 2020-12-19 18:45:25 -06:00
CitadelStationBot 1f93fd5efa Automatic changelog generation for PR #13803 [ci skip] 2020-12-19 09:08:28 -06:00
DeltaFire f458bc8182 Merge pull request #13803 from BlueWildrose/AI-RemoteDetonationCBT
Prevents traitor AI from doomsdaying while carded
2020-12-19 16:08:25 +01:00
silicons ad12207503 fix 2020-12-19 06:44:56 -07:00
silicons e2a99ff223 Recompile 2020-12-19 06:08:28 -07:00
Putnam fb31117a8d nah nah none of that. 2020-12-18 22:36:41 -08:00
Putnam f209fec1ee oh, that's why extended is there 2020-12-18 22:19:40 -08:00