260 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
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
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05: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
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
ariaworld 93f0fb7e6c Fix a few hard-dels 2024-01-21 16:14:07 +01:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
BongaTheProto 917eeb756a Merge remote-tracking branch 'upstream/master' 2022-09-03 16:42:38 -05:00
zeroisthebiggayandGitHub 7aeec9b083 replaces weight machine sprites with TG's and subsequently wipes a portion of the goon file's existence (#15829)
* basedado

* becnhpress
2022-08-31 21:38:44 -07:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
Hatterhat c91d12ef93 qstep 2022-08-06 21:42:55 -05:00
Hatterhat fdd03402ed dark souls 2022-08-06 16:25:28 -05:00
Turtle567 4f9a50b2c7 Buff Hiero Club, Chipped King Goat
Added +10 damage to all of the hierophant clubs attacks and raised their cooldown by a few seconds, this was needed as the hierophant club was hot ass previously.

Brought the King Goat to the vet and chipped him, he can now be found on any GPS with the "Regal Signal"
2022-07-25 16:47:28 -05:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
LinandGitHub 1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
siliconsandGitHub 2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree
Ashen tree!
2022-01-22 04:34:28 -08:00
Cognition c1a41394da flight fixes, pick all wing types if second wing potion chugged, a fucking slime species fix 2021-12-29 22:20:27 -07:00
Cognition 318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07: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
Trilbyspaceclone 41b3643631 tested and all working 2021-11-09 23:41:57 -05:00
Trilbyspaceclone c7fb7dd90f lower honey + metadata 2021-11-03 14:16:36 -04:00
TrilbyspacecloneandGitHub 2a4968489d 10-30 2021-11-02 09:31:54 -04:00
Trilbyspaceclone 7816417c32 tree fix and balance honey 2021-11-02 06:31:15 -04:00
TrilbyspacecloneandGitHub e10397777c Update ash_tree.dm 2021-11-02 06:06:23 -04:00
TrilbyspacecloneandGitHub 087e00be1c New line linnet thing 2021-11-01 11:40:01 -04:00
Trilbyspaceclone 5bd9b440a9 Ashen tree! 2021-11-01 11:27:42 -04:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
shellspeed1 26cb16311d A 2021-06-27 20:08:33 -07:00
zerothebigboy 3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
siliconsandGitHub af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
siliconsandGitHub bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
2021-04-08 03:22:46 -06:00
zerothebigboy 657d1f69c8 sex 2021-04-07 04:18:04 -04:00
SandPootandGitHub 2aa2a8c802 actually not that much needed 2021-03-31 20:28:50 -03:00
SandPoot df4779dced upload files 2021-03-29 22:26:34 -03:00
R3dtailandGitHub 0b3773163c Removes Ichor Crates from chest rolls
Does what it says on the tin
2021-03-24 22:20:09 -05:00
siliconsandGitHub 720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more
Hierophant staff no longer deals 30 damage
2021-03-20 14:32:14 -06:00
siliconsandGitHub df92faadd4 Update necropolis_chests.dm 2021-03-15 19:05:25 -07:00
dzahlus 71cbd8a615 no more free esword 2021-02-26 14:40:00 +01:00
keronshb 68b65c3f93 Fixes some error, re adds knockdown
should prevent item drops
2021-01-30 16:19:09 -05:00
keronshb 8a75d59db2 Meathook tweaks
Changes some values to make it a bit more fair.
2021-01-30 15:59:59 -05:00