Commit Graph
840 Commits
Author SHA1 Message Date
SandPoot 996e472f80 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-03 18:53:29 -03:00
zerothebigboy 8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy e76221f68b yeppers 2023-01-29 03:57:32 -05:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
LinandGitHub 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
shellspeed1 b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
SandPoot 6b481d2d66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-19 23:29:29 -03:00
Cognition 0c12f3f111 Removes persistence from glowing goo 2022-08-16 19:49:16 -06:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07: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 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
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
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
SandPoot 41949a8be1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-29 13:24:42 -03:00
Putnam3145 beac1064db Makes adv. firefighter foam remove other gases 2022-04-25 22:11:18 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03: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
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot 28cc02d653 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-22 17:18:15 -03:00
siliconsandGitHub f85d0dbda0 Merge pull request #15449 from Putnam3145/gib-podpeople
Allows pod people to be made using other fluids
2022-01-22 04:34:59 -08:00
SandPoot 086e3bc704 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-09 23:40:45 -03:00
LinandGitHub d7cbb017f6 Fix few instances of bleeding white blood (#15398)
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
Putnam3145 c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
BongaTheProtoandGitHub 038fb6fd55 Fixes some of the new size system's runtimes (#207)
checking if it's the correct type should be done for all procs that require shoes to be of type /obj/item/clothing/shoes
2021-12-10 14:15:33 -03:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
DeltaFire 6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
keronshb 1cd2c59776 Merge branch 'master' into familyport 2021-10-15 14:43:53 -04:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
SandPoot ecee82ed75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-12 12:55:02 -03:00
Hatterhat 1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
SandPoot 4b1df1bfb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 10:18:55 -03:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
SandPoot dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00