Commit Graph
9969 Commits
Author SHA1 Message Date
keronshb 4e91dde6b0 Timer fix and dead list removal 2021-09-30 14:50:04 -04:00
Putnam3145andGitHub a0a9089ce0 Removes "play on same board" from minesweeper (#15217) 2021-09-29 18:52:05 +02:00
raspy-on-osu c7020972ae init 2021-09-28 21:09:34 -04:00
SandPoot b23b88524d Upload files 2021-09-28 22:03:17 -03:00
siliconsandGitHub 5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
keronshb 5868c90fe8 Wizard fixes 2021-09-27 22:28:44 -04:00
keronshb eb548eb9b3 Fixes antag prefs breaking 2021-09-27 20:03:42 -04:00
Jordan BrownandGitHub 2db0511d0d Removes a dead var 2021-09-27 12:20:37 -04:00
keronshb 5da5ac396c Head blacklist for antag 2021-09-26 14:29:46 -04:00
keronshb af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
keronshb fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb cbe221e18f Adds more blackbox stuff 2021-09-23 19:57:51 -04:00
keronshb c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
WanderingFox95andGitHub d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
LinandGitHub ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches
no more powergaming dice bags
2021-09-20 23:59:53 -05:00
LinandGitHub 7a5e748344 Merge pull request #15185 from Citadel-Station-13/silicons-patch-6
fixes airlock deflection
2021-09-20 23:53:53 -05:00
WanderingFox95andGitHub c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
keronshb c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb 13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
keronshb 0b5a7c9759 OOPS FORGOT PIRATES and some blacklists 2021-09-19 17:56:26 -04:00
siliconsandGitHub 6d99bca184 Update obj_defense.dm 2021-09-19 14:46:09 -07:00
siliconsandGitHub 84a26eeabd Update obj_defense.dm 2021-09-19 14:45:24 -07:00
WanderingFox95andGitHub fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-09-19 15:23:52 -04:00
siliconsandGitHub 8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
siliconsandGitHub a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper
fixes dogborg sleepers not working
2021-09-19 11:09:06 -07:00
siliconsandGitHub 1c22d85061 Merge pull request #15158 from SandPoot/obscured-slots
Adds obscured slots and TRAIT_NODROP checks to the outline system
2021-09-19 11:07:08 -07:00
siliconsandGitHub e50125ca6b Merge pull request #15150 from Putnam3145/hacked-law-self-qdel
Makes special objective items delete on reroll
2021-09-19 11:06:29 -07:00
siliconsandGitHub c04f0cb953 Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
2021-09-19 11:06:15 -07:00
silicons 147903f654 sigh 2021-09-19 10:57:58 -07:00
keronshb 6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
LetterN 0b7e514739 t 2021-09-19 14:05:28 +08:00
buffyuwu b9b8e32860 fixes dogborg sleepers not working
closes #15142
2021-09-18 05:29:42 -04:00
SandPoot 382473eb88 Thicc 2021-09-17 14:15:39 -03:00
keronshb 408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb 372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb 095a803cc5 linter fixes 2021-09-16 13:51:39 -04:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
SandPoot f61c505bbf Glued items too 2021-09-16 01:37:05 -03:00
SandPoot 456f68b32b Upload files 2021-09-16 01:05:28 -03:00
keronshb c798eb1ef0 I'm overwhelmed 2021-09-15 19:13:08 -04:00
keronshb f2b7dba990 More fixes? 2021-09-15 18:52:24 -04:00
qweq12yt 781a414c38 fix space heaters 2021-09-15 18:16:04 -03:00
keronshb 5bed02e36e More fixes, I don't know 2021-09-15 16:12:19 -04:00
keronshb edde5043dd More fixes, more errors 2021-09-15 15:55:59 -04:00
keronshb 4eaeccf8d8 Fixes more errors 2021-09-15 15:25:26 -04:00
keronshb bbe6f80790 Re adds the log 2021-09-14 21:55:12 -04:00
keronshb 4f5071cc87 Clockwork fix and removal of station traits 2021-09-14 21:53:08 -04:00
keronshb 7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00