Commit Graph

42749 Commits

Author SHA1 Message Date
timothyteakettle b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle 80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
timothyteakettle 646f7726f3 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-06 22:09:35 +01:00
timothyteakettle eefabc9049 Update preferences.dm 2021-05-06 22:08:51 +01:00
Timothy Teakettle bee9d9c047 support for the ridiculous thing i just did 2021-05-05 22:29:21 +01:00
Timothy Teakettle d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Timothy Teakettle ea071bd031 comment 2021-05-05 18:28:55 +01:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Timothy Teakettle 1664459b14 squash bugs 2021-05-05 15:26:56 +01:00
timothyteakettle b2d8c980e4 task failed sucessfully 2021-05-05 00:54:44 +01:00
timothyteakettle f816bba62a bugfixes 2021-05-05 00:51:52 +01:00
timothyteakettle 7265c7111c new limb covering var for markings 2021-05-03 22:47:22 +01:00
timothyteakettle fac2b259ac big changes 2 2021-05-03 22:43:45 +01:00
timothyteakettle f4bb5255ab Revert "big changes"
This reverts commit 7ac50b7ba2.
2021-05-03 22:43:32 +01:00
timothyteakettle 7ac50b7ba2 big changes 2021-05-03 22:43:22 +01:00
Timothy Teakettle 93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle 2daed9250f some bugfixes 2021-05-02 18:30:35 +01:00
CitadelStationBot 27fa3a9855 Automatic changelog generation for PR #14670 [ci skip] 2021-05-01 20:18:52 -05:00
silicons e2dd3a32b8 Merge pull request #14670 from TripleShades/general-fixies
General main map fixes + touchups
2021-05-01 19:18:50 -06:00
Changelogs a745d1288c Automatic changelog compile [ci skip] 2021-05-02 00:30:35 +00:00
Timothy Teakettle 7efadade15 href fix 2021-05-01 20:55:13 +01:00
Timothy Teakettle 8aed1b4236 more color code 2021-05-01 20:37:22 +01:00
Timothy Teakettle ddc3e3b3b2 Update preferences.dm 2021-05-15 21:24:20 +01:00
Changelogs d59dbfbfda Automatic changelog compile [ci skip] 2021-05-01 00:27:12 +00:00
CitadelStationBot 567d43c9dd Automatic changelog generation for PR #14668 [ci skip] 2021-04-29 22:24:03 -05:00
Lin c80c974b6c Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
2021-04-29 22:24:00 -05:00
Changelogs 2cb353890e Automatic changelog compile [ci skip] 2021-04-30 00:25:57 +00:00
TripleShades 0c85455227 god i hate areas 2021-04-29 15:09:33 -04:00
TripleShades ee3b69989b Update PubbyStation.dmm 2021-04-29 14:20:11 -04:00
TripleShades e0eca566a9 Update PubbyStation.dmm 2021-04-29 14:04:04 -04:00
CitadelStationBot 0c803e0232 Automatic changelog generation for PR #14639 [ci skip] 2021-04-28 22:20:59 -05:00
silicons e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
CitadelStationBot 29aee4005c Automatic changelog generation for PR #14648 [ci skip] 2021-04-28 22:20:26 -05:00
silicons 986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
2021-04-28 21:20:24 -06:00
CitadelStationBot b69b2bc72c Automatic changelog generation for PR #14647 [ci skip] 2021-04-28 22:20:04 -05:00
silicons 4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
CitadelStationBot 74a5e0d051 Automatic changelog generation for PR #14649 [ci skip] 2021-04-28 22:17:58 -05:00
silicons cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
2021-04-28 21:17:55 -06:00
CitadelStationBot 914a5c7930 Automatic changelog generation for PR #14651 [ci skip] 2021-04-28 22:17:38 -05:00
silicons d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00
CitadelStationBot fc2bf6c24d Automatic changelog generation for PR #14659 [ci skip] 2021-04-28 22:17:17 -05:00
silicons 17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
CitadelStationBot 86ad5fd32d Automatic changelog generation for PR #14635 [ci skip] 2021-04-28 22:17:08 -05:00
silicons 9bef72f205 Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
2021-04-28 21:17:06 -06:00
CitadelStationBot 152c88fe46 Automatic changelog generation for PR #14636 [ci skip] 2021-04-28 22:17:00 -05:00
silicons 86bdb2455d Merge pull request #14636 from TheObserver-sys/CrateDeal
Inconsistency Fixes, 10MM Rifle tweaks.
2021-04-28 21:16:58 -06:00
CitadelStationBot 82d166017c Automatic changelog generation for PR #14643 [ci skip] 2021-04-28 22:16:53 -05:00