Commit Graph

18732 Commits

Author SHA1 Message Date
Blue Wildrose c02f35a7e5 Glowing goo be gone 2021-03-20 11:29:15 -07:00
Blue Wildrose bc36e73c7e maybe I should include this check 2021-03-20 06:52:13 -07:00
Blue Wildrose 3a37cc6325 Some sensory detail 2021-03-20 06:37:37 -07:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
silicons 1b622af5e7 Merge pull request #14465 from The-Sun-In-Splendour/fix-post-absorb-revive
Fixes post absorb revive
2021-03-20 01:30:37 -06:00
Lin 51b955d47e Merge pull request #14460 from Hatterhat/exp-sup-con
moves the express supply console and upgrade disk to appropriate tabs
2021-03-19 19:18:19 -05:00
qweq12yt 265af827b8 ah you pesky ambiguity 2021-03-19 17:58:30 -03:00
qweq12yt 4838dd40de small typo 2021-03-19 16:06:23 -03:00
qweq12yt a3ba3c1928 fix ui not opening 2021-03-19 15:36:14 -03:00
kappa-sama 1f7b15d8f8 clonwops 2021-03-19 15:35:17 -03:00
kappa-sama 2e41925392 poggers
Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com>
2021-03-19 15:32:54 -03:00
kappa-sama 524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
ItzGabby 68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby 4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
silicons d7829db9ca let's make this more clear 2021-03-18 21:55:21 -07:00
silicons bff668b743 why 2021-03-18 21:53:53 -07:00
LetterN 2c2e779aa6 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-19 10:28:43 +08:00
Timothy Teakettle 71d5528959 fix 2021-03-18 21:50:03 +00:00
silicons 8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
2021-03-18 06:41:38 -06:00
silicons f6f2c27e90 Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
2021-03-18 06:40:51 -06:00
silicons 3e8fcfe72a Merge pull request #14456 from Putnam3145/antag_pref
Added a "no antags please" pref
2021-03-18 06:39:48 -06:00
silicons bb03d4ff41 Merge pull request #14446 from The-Sun-In-Splendour/secciejacket
shameless buff to sec jacket
2021-03-18 06:39:24 -06:00
silicons e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
Ludox 828cfaf58a Cellular Emporium is gone 🦀
Prevents you from seeing cellular emporium despite not being able to use it (Post-absorb)
2021-03-18 04:32:33 +01:00
GrayRachnid 5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
Ludox fca5ede923 Shitcode has arrived 2021-03-18 02:32:54 +01:00
Lin f3fb22a2ab Merge pull request #14448 from Arturlang/give_fixes
Literally just adds targets to give because i forgot to do that
2021-03-17 16:32:11 -05:00
Hatterhat 5fa06109ac lemme get uh 2021-03-17 15:49:57 -05:00
DeltaFire 45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
2021-03-17 17:01:47 +01:00
Hatterhat 97e0e01265 ok 2021-03-17 03:25:06 -05:00
Putnam f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
LetterN 69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
2021-03-17 11:49:50 +08:00
SandPoot 6bf711d7ec Update syndicate.dm 2021-03-16 22:54:59 -03: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
kiwedespars 158008b80f maybe too big a buff 2021-03-16 11:05:49 -07:00
kiwedespars 1886bef04e changes
- void blade requires colder temps
- boogie woogie fueltank swap
- sicklebreak buff
- big domain expansion buff
- grasping carving nerf
- clamps silence maybe
2021-03-16 03:23:18 -07:00
Artur fe218150f0 Literally just adds targets to give because i forgot to do that 2021-03-16 11:48:21 +02:00
LetterN 228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08: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
The-Sun-In-Splendour 3dfa54270f Update labcoat.dm 2021-03-16 06:49:45 +01:00
Artur 6f6eedb92c tweaks vampires not to die from bloodloss 2021-03-16 06:47:39 +02: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
DeltaFire f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01: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