SandPoot
|
2d87780147
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-02-13 18:06:56 -03:00 |
|
SandPoot
|
56d972eb0b
|
all sorts of fixes and updates, may break stuff
|
2025-02-09 02:09:28 -03:00 |
|
SandPoot
|
a2aa92cbc4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-01-24 02:08:58 -03:00 |
|
ariaworld
|
44e507dfef
|
[BEESTATION PORT] Semi-Port of Beestation Decal Fixes, Fixes turf decals disappearing on shuttle movements (#16119)
* SEMI-PORT OF BEESTATION PR #3111: Decal fixes
* Forgot this, rotate flag
|
2025-01-24 01:47:50 -03:00 |
|
SandPoot
|
002a4c31c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 22:06:15 -03:00 |
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
SandPoot
|
a65f323734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
|
2024-03-08 19:10:22 -03:00 |
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
SandPoot
|
46384d2a67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-07 03:36:25 -03:00 |
|
SandPoot
|
003eec1850
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons
|
2024-01-07 02:09:58 -03:00 |
|
SandPoot
|
387b4b236c
|
push
|
2024-01-07 00:37:16 -03:00 |
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
SandPoot
|
65ed5c79f4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-30 02:07:21 -03:00 |
|
deathride58
|
9217fcc7dc
|
Merge pull request #16043 from SandPoot/stacks
Make stacks show how much there are in inventory
|
2023-12-29 22:57:38 -05:00 |
|
deathride58
|
c95f60c37b
|
Merge pull request #16034 from BlueWildrose/TransRightsAreHumanRights
Adds decal patterns to LGBT holidays + Pansexual and Panromantic Awareness Day holiday
|
2023-12-29 22:05:37 -05:00 |
|
SandPoot
|
6733de69bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks
|
2023-12-29 23:16:11 -03:00 |
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
SandPoot
|
27bdd4b732
|
aiModule > ai_module
|
2023-12-17 23:20:43 -03:00 |
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
SandPoot
|
f626df9d1d
|
push
|
2023-12-13 00:08:58 -03:00 |
|
SandPoot
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
deathride58
|
4e39bef762
|
Merge pull request #16040 from SandPoot/better-countdown-effect
Makes countdown objects follow their targets better
|
2023-12-12 19:21:51 -05:00 |
|
SandPoot
|
f95f776547
|
push
|
2023-12-11 18:30:19 -03:00 |
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
BlueWildrose
|
8e72f5e7c4
|
code for patterns
|
2023-11-16 16:32:48 -07:00 |
|
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 |
|
Lin
|
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 |
|