 zerothebigboy
|
01d92230a3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/mask.dmi
|
2021-03-16 19:19:12 -04:00 |
|
|
CitadelStationBot
|
4053758828
|
Automatic changelog generation for PR #14347 [ci skip]
|
2021-03-16 14:32:01 -05:00 |
|
|
DeltaFireandGitHub
|
b105a3c831
|
Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
|
2021-03-16 20:31:58 +01:00 |
|
|
CitadelStationBot
|
50631f3bbd
|
Automatic changelog generation for PR #14141 [ci skip]
|
2021-03-16 01:39:43 -05:00 |
|
|
DeltaFireandGitHub
|
79a464ca8c
|
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
|
2021-03-16 07:39:41 +01:00 |
|
|
|
fb9ecc50d5
|
Update code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-03-16 02:32:56 -04:00 |
|
|
LinandGitHub
|
73b29bcca0
|
Merge pull request #14438 from Citadel-Station-13/shrinemaidendonator
Adds Shrine Maiden outfit for donator
|
2021-03-15 19:27:24 -05:00 |
|
|
Changelogs
|
5c4ecc6261
|
Automatic changelog compile [ci skip]
|
2021-03-16 00:14:12 +00:00 |
|
|
Dan-Neposh
|
beed7f91ce
|
Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2
|
2021-03-15 18:30:30 -04:00 |
|
|
Dan-Neposh
|
57bfec61b9
|
sound fixes for Ratvar's ending sequence
|
2021-03-15 18:08:02 -04:00 |
|
|
Dan-Neposh
|
d1d29503d2
|
sound fixes for Ratvar's ending sequence
|
2021-03-15 17:25:52 -04:00 |
|
|
Dan-Neposh
|
f96c6bc728
|
Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2
|
2021-03-15 16:33:38 -04:00 |
|
|
|
791d8f133d
|
Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-03-15 16:43:23 -04:00 |
|
|
CitadelStationBot
|
c32f3644a6
|
Automatic changelog generation for PR #14439 [ci skip]
|
2021-03-15 15:17:46 -05:00 |
|
|
Dan-Neposh
|
39c9da93c9
|
deletes an unneeded space
|
2021-03-15 16:17:44 -04:00 |
|
|
siliconsandGitHub
|
4c8711bf40
|
Merge pull request #14439 from Putnam3145/nob-nerf
Nerfs hyper-nob/nitryl's point values
|
2021-03-15 14:17:44 -06:00 |
|
|
Dan-Neposh
|
076955ac41
|
fixes the transformation rites
|
2021-03-15 15:12:16 -04:00 |
|
|
DeltaFireandGitHub
|
039a337842
|
Merge pull request #14416 from GrayRachnid/abductors-more-players
Adjusts the abductors event to only trigger when there's 30 players.
|
2021-03-15 17:02:33 +01:00 |
|
|
DeltaFireandGitHub
|
be41ead215
|
Merge pull request #14319 from silicons/async_2
enforces SHOULD_NOT_SLEEP on Life(), fixes some more process() sleeps that might be causing controller lockups
|
2021-03-15 17:01:42 +01:00 |
|
|
DeltaFireandGitHub
|
5444ceacb3
|
Merge pull request #14385 from Citadel-Station-13/silicons-patch-5
fixes control_object being unnecessarily vv locked
|
2021-03-15 16:46:08 +01:00 |
|
|
DeltaFireandGitHub
|
1f34d14d7b
|
Merge pull request #14382 from Citadel-Station-13/silicons-patch-4
Fixes lavaland floor tiles/necropolis gate abstract objects being able to be radiated
|
2021-03-15 16:44:49 +01:00 |
|
|
CitadelStationBot
|
2fcac37ebe
|
Automatic changelog generation for PR #14421 [ci skip]
|
2021-03-15 10:35:09 -05:00 |
|
|
DeltaFireandGitHub
|
e6b104880c
|
Merge pull request #14421 from GrayRachnid/remove-illegals
Removes the illegal tech node from a few common items that are found through space/gateway/lavaland exploration.
|
2021-03-15 16:35:06 +01:00 |
|
|
CitadelStationBot
|
9c829b943f
|
Automatic changelog generation for PR #14433 [ci skip]
|
2021-03-15 00:30:40 -05:00 |
|
|
siliconsandGitHub
|
42c330c23d
|
Merge pull request #14433 from HeroWithYay/Light_Fix
Fixes a spelling mistake.
|
2021-03-14 23:30:38 -06:00 |
|
|
CitadelStationBot
|
fef8450d84
|
Automatic changelog generation for PR #14398 [ci skip]
|
2021-03-15 00:30:30 -05:00 |
|
|
siliconsandGitHub
|
5472186bc2
|
Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
|
2021-03-14 23:30:26 -06:00 |
|
|
Putnam
|
700bfd71e3
|
Also reduces nitryl since I changed that too
|
2021-03-14 20:28:35 -07:00 |
|
|
Putnam
|
c30fdfe5fc
|
Nerfs hyper-nob's point values
|
2021-03-14 20:14:32 -07:00 |
|
|
CitadelStationBot
|
b8e8161850
|
Automatic changelog generation for PR #14437 [ci skip]
|
2021-03-14 21:13:04 -05:00 |
|
|
LinandGitHub
|
63dc8f5d7e
|
Merge pull request #14437 from Putnam3145/supernova-rebalance
Tweaks supernova to not be inconsequential as often
|
2021-03-14 21:13:02 -05:00 |
|
|
Putnam
|
9a3e1d0307
|
wow that's REALLY REALLY BAD
|
2021-03-14 19:02:44 -07:00 |
|
|
Jay
|
e4ab673e4a
|
Adds Shrine Maiden outfit for donator
|
2021-03-14 18:40:01 -05:00 |
|
|
Timothy Teakettle
|
818d1cbec6
|
forgive me linters for i have sinned
|
2021-03-14 22:43:48 +00:00 |
|
|
Putnam
|
c9923f7e47
|
Tweaks supernova to not be inconsequential as often
|
2021-03-14 15:31:05 -07:00 |
|
|
CitadelStationBot
|
932e0fe0cd
|
Automatic changelog generation for PR #14397 [ci skip]
|
2021-03-14 01:20:59 -06:00 |
|
|
siliconsandGitHub
|
21ff66b1a5
|
Merge pull request #14397 from SandPoot/fixes-tcomms-for-AIs
Fixes general interactions with telecomms.
|
2021-03-14 00:20:57 -07:00 |
|
|
Changelogs
|
947bc8c42e
|
Automatic changelog compile [ci skip]
|
2021-03-14 00:15:00 +00:00 |
|
|
CitadelStationBot
|
5f70ca75b4
|
Automatic changelog generation for PR #14411 [ci skip]
|
2021-03-13 13:47:36 -06:00 |
|
|
siliconsandGitHub
|
d985e9bae3
|
Merge pull request #14411 from kiwedespars/cute-plushie
adds a cute new plushie
|
2021-03-13 12:47:34 -07:00 |
|
|
CitadelStationBot
|
d0c0aa874b
|
Automatic changelog generation for PR #14419 [ci skip]
|
2021-03-13 13:18:01 -06:00 |
|
|
siliconsandGitHub
|
186682d38d
|
Merge pull request #14419 from necromanceranne/augment_fixes
Fixes cosmetic augments missing their feet
|
2021-03-13 12:17:58 -07:00 |
|
|
HeroWithYay
|
5ee6f23841
|
Safty isn't a word and even if it was this wouldn't be how you use it in a sentence.
|
2021-03-14 03:39:31 +13:00 |
|
|
kiwedespars
|
815ebd97da
|
Merge branch 'master' into cute-plushie
|
2021-03-13 01:41:28 -08:00 |
|
|
kiwedespars
|
aaf9ebd85a
|
Update rust_g.dll
|
2021-03-12 23:29:34 -08:00 |
|
|
kiwedespars
|
cd4655257b
|
Merge remote-tracking branch 'upstream/master'
|
2021-03-12 23:10:48 -08:00 |
|
|
CitadelStationBot
|
a980c84958
|
Automatic changelog generation for PR #14310 [ci skip]
|
2021-03-12 20:40:05 -06:00 |
|
|
siliconsandGitHub
|
5a9fc99aba
|
Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
|
2021-03-12 19:40:02 -07:00 |
|
|
CitadelStationBot
|
250f743d0c
|
Automatic changelog generation for PR #14402 [ci skip]
|
2021-03-12 20:35:58 -06:00 |
|
|
siliconsandGitHub
|
2a6ccada97
|
Merge pull request #14402 from Hatterhat/limbgrowers
limb growers for pubby and delta
|
2021-03-12 19:35:56 -07:00 |
|