Commit Graph
7014 Commits
Author SHA1 Message Date
SandPoot 78b4d94c96 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:00:44 -03:00
LinandGitHub 6f97ec2b1d Merge pull request #15656 from deathride58/animfix
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
2022-06-07 18:05:07 +00:00
Pin-alternative 64cbd81e9c Merge remote-tracking branch 'upstream/master' into cursed 2022-06-07 17:10:33 +10:00
deathride58 75983aca0d makes railings climbable both ways. without issues. in literally one single line 2022-06-06 01:31:51 -04:00
deathride58 b02372afb0 minimap refresh - high-detail, JS fixes, pixel-perfect scaling, and more! 2022-06-04 22:44:15 -04:00
BongaTheProto 04d9c7d167 Merge remote-tracking branch 'upstream/master' 2022-06-04 13:25:54 -05:00
SandPootandGitHub 229b618dee CRISPR for Base Gene editing (#258)
* push the content

* tiny update
2022-06-03 21:29:19 -03:00
deathride58 04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04:00
BongaTheProto 53fa6873d1 Merge remote-tracking branch 'upstream/master' 2022-06-02 09:57:31 -05:00
SandPoot d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
deathride58 1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
Pin-alternative b3b70bb319 Merge remote-tracking branch 'upstream/master' into cursed 2022-05-30 20:09:20 +10:00
Pin-alternative c0f224efff some more crap 2022-05-28 20:18:09 +10:00
BongaTheProto be74edefd0 Merge branch 'master' into prefs-update 2022-05-28 02:06:44 -05:00
deathride58 20eb61b319 makes slimes specifically have overlay-blended blood! 2022-05-26 22:56:10 -04:00
deathride58 a37c3a8721 multiplicative blood - makes the majority of blood visuals use multiplicative blending 2022-05-25 03:25:20 -04:00
BongaTheProto 4735651dd4 Merge remote-tracking branch 'upstream/master' 2022-05-24 09:35:48 -05:00
SandPootandGitHub fac92f66ca You can now make shuttle seats with titanium (#255)
* Update mineral.dm

* consistency
2022-05-23 23:04:24 -03:00
BongaTheProto 92365973ea Merge branch 'master' into prefs-update 2022-05-21 03:18:18 -05:00
BongaTheProto 85ab43e734 Merge remote-tracking branch 'upstream/master' 2022-05-21 03:00:06 -05:00
SandPoot 89fa5c0bfe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-21 00:13:59 -03:00
deathride58 f9ea85852e fixes blood trails looking Wonky by removing their base iconstate 2022-05-18 21:40:35 -04:00
BongaTheProto d151f761e7 some adds 2022-05-18 19:18:08 -05:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
BongaTheProto 90a52494cd Merge remote-tracking branch 'upstream/master' 2022-04-30 16:35:30 -05:00
SandPoot 41949a8be1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-29 13:24:42 -03:00
AshTheDergandGitHub 635d1afc60 Fix for missing Hotel Staff outfit
Replaces the Telegram Outfit, which seems to be missing a sprite, with the Red Suit outfit. Temporary fix. Staff will now no longer be inappropriately nude.
2022-04-29 02:13:13 -04:00
siliconsandGitHub ce7d7a5124 Merge pull request #15594 from SandPoot/stasis-beds-update
Makes stasis beds *slightly* less hated
2022-04-27 16:11:34 -07:00
BongaTheProto 6950996460 crawling under + no under (lol)
- crawling under tables
- no more unders spawn with jumpsuits (?)
2022-04-26 17:10:31 -05:00
Putnam3145 beac1064db Makes adv. firefighter foam remove other gases 2022-04-25 22:11:18 -07:00
BongaTheProto 479b497b00 ok 2022-04-19 01:30:44 -05:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
TemptStationandnullfag 9b63431a50 Merge pull request #5 from NullFag/kill_me
smexi fix
2022-04-15 00:40:12 +02:00
SandPoot 5d4bae4482 Update files 2022-04-10 23:27:12 -03:00
BongaTheProtoandGitHub 032a0c1cf6 Merge pull request #277 from AManWithAToolbox/ashie
Small ashie update
2022-04-09 12:24:47 -05:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
AManWithAToolbox fc962c2680 update 2022-04-08 15:49:50 -05:00
BongaTheProto 10eb587407 Merge remote-tracking branch 'upstream/master' 2022-04-08 13:46:43 -05:00
SandPoot 31a179f95d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-08 13:57:46 -03:00
siliconsandGitHub 904990a037 Merge pull request #15584 from Arturlang/StasisBeds
Stasis beds
2022-04-08 09:47:26 -07:00
Solaris-ShadeandGitHub 48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00