259 Commits
Author SHA1 Message Date
PatrickLeeJohnson 130ca0c49c Update food_righthand.dmi 2025-01-19 16:14:42 +03:00
PatrickLeeJohnson 367447c96f milkshakes and stuff 2025-01-08 20:13:29 +03:00
SandPoot af33de25b4 the commit 2023-10-03 14:22:05 -03:00
SandPoot b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
zerothebigboy c10b026492 yeah 2023-01-29 22:01:59 -05:00
zerothebigboy c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre
# Conflicts:
#	icons/obj/items_and_weapons.dmi
2023-01-29 21:59:01 -05:00
zerothebigboy b8bc94ba13 man 2023-01-29 00:49:55 -05:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
zerothebigboy 4f034eadc1 yep 2023-01-26 05:54:51 -05:00
Darius 7dc500e526 Fix Advanced Mop inhands sprite
Restores the sprite to it's unique advmop variant, and fixes a sprite order issue.
2023-01-03 13:10:48 -05:00
siliconsandGitHub bfd3aadab1 Merge pull request #15773 from zeroisthebiggay/mining
mining drills scanners and crushers getting a TG inspired glow up
2022-08-20 12:27:20 -07:00
siliconsandGitHub 23586cb7fd Merge pull request #15768 from zeroisthebiggay/ninjagungo
ninja sprite refresh + very minor evening/midnight gloves consistency + removes a stray pixel from the mauler gauntlets
2022-08-20 12:25:25 -07:00
zerothebigboy 4e0498573f thefartdomeengages 2022-08-13 18:16:37 -04:00
zerothebigboy 1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
zerothebigboy 4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04:00
zerothebigboy f39de3b781 yeah 2022-08-09 13:26:13 -04:00
zerothebigboy 8fc9acabb2 updat e 2022-08-08 15:02:02 -04:00
LinandGitHub efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
Hatterhat 7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
WanderingFox95andGitHub 84f1b6a7a4 these too 2021-09-24 01:02:27 +02:00
WanderingFox95andGitHub f2075db4df put these in the wrong place. 2021-09-24 01:02:17 +02:00
WanderingFox95andGitHub c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
WanderingFox95andGitHub a426388597 And inhands 2021-09-19 21:33:51 +02:00
WanderingFox95andGitHub fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
WanderingFox95andGitHub a0cdc8abb7 please 2021-09-19 21:31:58 +02:00
WanderingFox95andGitHub 45602efbbf Now? 2021-09-19 21:26:46 +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
zerothebigboy 4c82eeeb2a soup 2021-09-18 18:18:04 -04:00
siliconsandGitHub bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass
the unatomized hypospray/medbay tools/emergency kits resprite
2021-09-08 20:40:20 -07:00
siliconsandGitHub ff28789f27 Merge pull request #15064 from zeroisthebiggay/hammers
tg hammers port uwu
2021-09-08 20:39:46 -07:00
zerothebigboy 94c6fd5bbc hammers 2021-09-02 03:26:09 -04:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
zerothebigboy d831a84195 cool 2021-09-01 05:15:22 -04:00
zerothebigboy fe90ea3ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass 2021-09-01 05:14:27 -04:00
zerothebigboy 0e95e1a8ad cool 2021-09-01 05:14:17 -04:00
zerothebigboy 8dd91fbe93 ok 2021-08-29 02:56:58 -04:00
zerothebigboy 06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
siliconsandGitHub 2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
WanderingFox95andGitHub 36675e56bf Hammer sprites for the ...well, bone glaive. 2021-07-20 17:27:27 +02:00
siliconsandGitHub 472fda9504 Merge pull request #14833 from zeroisthebiggay/finallytools
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
2021-07-04 10:59:43 -07:00
zerothebigboy fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-06-20 03:29:50 -04:00
zerothebigboy a64d94a7cc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:25:35 -04:00
zerothebigboy bae89fcaba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:19:01 -04:00
zerothebigboy 319e03476b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites 2021-06-13 18:16:08 -04:00
zerothebigboy e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
zerothebigboy e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
zerothebigboy 3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
zerothebigboy 53e95b7356 theseventeenthofmany 2021-06-11 19:48:04 -04:00
zerothebigboy 8a5a5ef6cc thethirteenthofmany 2021-06-11 19:22:05 -04:00