Commit Graph
43082 Commits
Author SHA1 Message Date
Timothy Teakettle 60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
DeltaFire 0c0e5f6d18 fixes 2021-05-10 17:44:21 +02:00
Timothy Teakettle c51fa954cf Update mobs.dm 2021-05-10 14:51:18 +01:00
Timothy Teakettle be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
Timothy Teakettle 24774856bc Update preferences.dm 2021-05-10 14:34:22 +01:00
Timothy Teakettle cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle 6926ea74ab Update preferences.dm 2021-05-10 13:58:53 +01:00
CitadelStationBot d9e86fdd49 Automatic changelog generation for PR #14698 [ci skip] 2021-05-10 01:27:50 -05:00
LinandGitHub 0b9210b821 Merge pull request #14698 from bunny232/Delta-Atmos
Delta station xenobio atmos enhancements.
2021-05-10 01:27:48 -05:00
LinandGitHub c0a56eb766 Merge pull request #14695 from Putnam3145/supernova-end-notification
Supernovae now announce when over, + other supernova tweaks
2021-05-10 01:24:05 -05:00
Timothy Teakettle 6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01:00
zerothebigboy fe96caefdc this is layered correctly 2021-05-09 19:15:31 -04:00
LetterN 1bee003d49 fixes roundend runtime 2021-05-09 22:48:50 +08:00
LetterN 57044515d2 fixes-emag-on-console 2021-05-09 21:39:26 +08:00
LetterN 2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
zerothebigboy 389617ac2f this looks marginally better 2021-05-09 05:01:07 -04:00
zerothebigboy 181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00
Changelogs df2f94b3be Automatic changelog compile [ci skip] 2021-05-09 00:19:34 +00:00
keronshb 1804b7ba63 Skewer Pain
Replaces ouchie with *pain
2021-05-08 19:35:55 -04:00
Timothy Teakettle d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
Timothy Teakettle 23015f83c4 re-adds the newline 2021-05-08 21:04:27 +01:00
Timothy Teakettle 0bc90971ff removes the newline 2021-05-08 21:04:01 +01:00
Putnam3145andGitHub 90fcc02ba9 Merge pull request #14674 from silicons/atmosstuffs
[ATMOS CHANGE TESTMERGE THIS OH GOD] adds multiz_accessible_levels infinite loop guard, reworks atmos adjacent turfs proc
2021-05-07 21:36:46 -07:00
Timothy Teakettle 022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle 42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
CitadelStationBot 931b913d57 Automatic changelog generation for PR #14693 [ci skip] 2021-05-07 19:43:50 -05:00
siliconsandGitHub 5aa87afd9c Merge pull request #14693 from dzahlus/i-bought-a-new-sample-pack-and-this-guy-named-one-of-the-samples-cumbledore.wav-
New traitor AI spawn and doomsday device alert sounds
2021-05-07 18:43:48 -06:00
CitadelStationBot 838ef5db0f Automatic changelog generation for PR #14637 [ci skip] 2021-05-07 19:42:26 -05:00
siliconsandGitHub 4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
CitadelStationBot 3d4ee80b9c Automatic changelog generation for PR #14696 [ci skip] 2021-05-07 19:41:51 -05:00
siliconsandGitHub 557eddb7dc Merge pull request #14696 from Putnam3145/priority_announce_verb
Adds make priority announcement admin verb
2021-05-07 18:41:48 -06:00
CitadelStationBot e933556667 Automatic changelog generation for PR #14688 [ci skip] 2021-05-07 19:41:25 -05:00
siliconsandGitHub 633591b81e Merge pull request #14688 from SandPoot/good-tooltips
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
CitadelStationBot eea0fa240d Automatic changelog generation for PR #14684 [ci skip] 2021-05-07 19:40:43 -05:00
siliconsandGitHub 44fdbaadcb Merge pull request #14684 from zeroisthebiggay/pirates
Pirate Update: Milk Is Not A Medical Substitute
2021-05-07 18:40:41 -06:00
CitadelStationBot 2b9924b2c3 Automatic changelog generation for PR #14664 [ci skip] 2021-05-07 19:40:36 -05:00
siliconsandGitHub e8b7abcfc6 Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin
The Unrolling Pin! (Ready)
2021-05-07 18:40:33 -06:00
Timothy Teakettle 149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle 5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle 5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle 108ff3d2f4 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-08 01:27:22 +01:00
Changelogs dbb8d82d64 Automatic changelog compile [ci skip] 2021-05-08 00:17:45 +00:00
LinandGitHub d36e82c1c1 Merge pull request #14691 from silicons/radiationmaybe
so i fixed radiation not going away but it fixed the race condition that let radioactive things.. actually stack so let's make chernobyl a thing again yay :)
2021-05-07 13:51:10 -05:00
LinandGitHub 54e12f2478 Merge pull request #14690 from silicons/firefighting_foam
some changes to firefighting foam, fixes vscode launch bat
2021-05-07 13:51:05 -05:00
LinandGitHub 2dc1c48cb7 Merge pull request #14692 from Citadel-Station-13/silicons-patch-29
WHY WOULD YOU MAKE ZEOLITES NOT WORK IN SMOKE AAAAAAAA
2021-05-07 13:50:35 -05:00
timothyteakettle bb893383bc Update _bodyparts.dm 2021-05-07 17:27:55 +01:00
timothyteakettle 0fb72497ff color fix 2021-05-07 16:46:40 +01:00
timothyteakettle bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
bunny232 94db1c3d46 Update DeltaStation2.dmm 2021-05-07 08:31:49 -04:00
bunny232andGitHub 81ad7f9357 Merge pull request #1 from Citadel-Station-13/master
update
2021-05-07 08:00:31 -04:00