GrayRachnid
|
5201cf6ac5
|
stops racism
|
2021-03-17 21:58:41 -04:00 |
|
Lin
|
40fb1f2a0b
|
Merge pull request #14445 from Citadel-Station-13/silicons-patch-7
ghost swords now properly set force instead of just working on mobs
|
2021-03-16 20:48:10 -05:00 |
|
DeltaFire
|
b105a3c831
|
Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
|
2021-03-16 20:31:58 +01:00 |
|
DeltaFire
|
79a464ca8c
|
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
|
2021-03-16 07:39:41 +01:00 |
|
Heretical Lizard
|
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 |
|
silicons
|
df92faadd4
|
Update necropolis_chests.dm
|
2021-03-15 19:05:25 -07:00 |
|
Dan-Neposh
|
57bfec61b9
|
sound fixes for Ratvar's ending sequence
|
2021-03-15 18:08:02 -04:00 |
|
Dan-Neposh
|
f96c6bc728
|
Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2
|
2021-03-15 16:33:38 -04:00 |
|
Heretical Lizard
|
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 |
|
Dan-Neposh
|
39c9da93c9
|
deletes an unneeded space
|
2021-03-15 16:17:44 -04:00 |
|
silicons
|
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 |
|
DeltaFire
|
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 |
|
DeltaFire
|
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 |
|
DeltaFire
|
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 |
|
DeltaFire
|
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 |
|
DeltaFire
|
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 |
|
silicons
|
42c330c23d
|
Merge pull request #14433 from HeroWithYay/Light_Fix
Fixes a spelling mistake.
|
2021-03-14 23:30:38 -06:00 |
|
silicons
|
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 |
|
Putnam
|
9a3e1d0307
|
wow that's REALLY REALLY BAD
|
2021-03-14 19:02:44 -07: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 |
|
silicons
|
21ff66b1a5
|
Merge pull request #14397 from SandPoot/fixes-tcomms-for-AIs
Fixes general interactions with telecomms.
|
2021-03-14 00:20:57 -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 |
|
silicons
|
5a9fc99aba
|
Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
|
2021-03-12 19:40:02 -07:00 |
|
silicons
|
9d48fba839
|
Merge pull request #14410 from Adelphon/hair
new hair/sprite fix
|
2021-03-12 19:35:47 -07:00 |
|
Lin
|
907ac9fc8a
|
Merge pull request #14423 from Putnam3145/mode-chaos
makes the chaos thing actually work (whoops)
|
2021-03-12 18:21:40 -06:00 |
|
Putnam
|
49e1673047
|
how did i mess up a copypasta like this
|
2021-03-12 15:44:15 -08:00 |
|
Putnam
|
4fb560ea98
|
makes the chaos thing actually work (whoops)
|
2021-03-12 14:46:58 -08:00 |
|
GrayRachnid
|
69abd3ac9a
|
removes illegal tech from a few common items that can be found in space/gateway exploration
|
2021-03-12 17:31:54 -05:00 |
|
Lin
|
9a16375e0b
|
Merge pull request #14403 from Hatterhat/brped-desc
fixes the BRPED desc that has been quirky! for years
|
2021-03-12 14:30:02 -06:00 |
|
Hatterhat
|
48de811919
|
fucking finally holy shit
|
2021-03-11 19:10:23 -06:00 |
|
GrayRachnid
|
510ec3568b
|
Makes it so abductors require 30 players to trigger
|
2021-03-11 18:16:49 -05:00 |
|
silicons
|
753d79be69
|
Update boss.dm
|
2021-03-11 05:54:36 -07:00 |
|
Lin
|
521570793f
|
Merge pull request #14392 from R3dtail/patch-4
Readability/Grammar alteration
|
2021-03-10 18:34:47 -06:00 |
|
Adelphon
|
56cccc2ca3
|
new hair
|
2021-03-10 18:14:07 -05:00 |
|
silicons
|
3292e3a725
|
Merge pull request #14393 from Auris456852/master
Corrects Hexacamphor
|
2021-03-10 14:02:35 -07:00 |
|
silicons
|
7e3d72eddb
|
Merge pull request #14376 from Putnam3145/mode-chaos
Adds recent-chaos weighting for secret
|
2021-03-10 14:02:11 -07:00 |
|
Hatterhat
|
6a7d4e32d7
|
i'm gonna fight blackmajor over this
|
2021-03-10 13:55:00 -06:00 |
|
silicons
|
939a493334
|
Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
|
2021-03-10 01:32:52 -07:00 |
|
silicons
|
18fdd0c6cf
|
Merge pull request #14337 from kiwedespars/we-hate-cqc
nerfs cqc (probably)
|
2021-03-10 01:32:14 -07:00 |
|
silicons
|
03fbb256e4
|
Merge pull request #14371 from Sneakyrat6/matContainer
Material container fixes
|
2021-03-10 01:31:51 -07:00 |
|
Putnam
|
25b021a343
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos
|
2021-03-10 00:06:40 -08:00 |
|
Putnam
|
40dfd40bcd
|
Made it not weight almost entirely based on chaos.
|
2021-03-10 00:04:35 -08:00 |
|
Letter N
|
138cfd388f
|
a
|
2021-03-10 14:40:25 +08:00 |
|
silicons
|
0db0612e56
|
Merge pull request #14383 from Literallynotpickles/no-more-triple-paramedic
Removes one paramedic slot
|
2021-03-09 23:26:53 -07:00 |
|
Lin
|
1216a6edc5
|
Merge pull request #14381 from LetterN/patch-5
fixes drone inventory deleting stuff
|
2021-03-09 22:45:02 -06:00 |
|
silicons
|
007ed3e851
|
Merge pull request #14378 from necromanceranne/cyberlimbies
The augment manipulator can make printed prosthetics look like the roundstart choosable limbs
|
2021-03-09 21:41:24 -07:00 |
|