138 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 2709ec887c Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-06 19:06:12 -05:00
SandPoot c2df4281b9 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-05 23:31:50 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
BongaTheProto 327ea3999f Merge branch 'master' into 515-auxmos 2024-03-31 21:32:01 -05:00
Elizabeth Lavenza 90378d4da9 Fix direct Destroy calls 2024-03-28 18:18:31 -04:00
Elizabeth Lavenza a2f90292b4 Fix harddels with hardened spikes 2024-03-28 18:14:49 -04: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 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
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03: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
SandPoot 24b740999b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-13 02:48:21 -03:00
Putnam3145 a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot a0c181a721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 15:13:32 -03:00
DeltaFire e71e86cf23 adapted 2022-01-29 16:43:03 +01:00
SandPootandGitHub 6790009f7a Size Stuff (#206)
* Upload files

* Update holder_micro.dm

* Upload files
2021-12-09 14:13:27 -03: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
Putnam3145 dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
siliconsandGitHub a88561d1aa Merge pull request #14770 from keronshb/spaceadaptaura
Changes Space Adapt to a proper animated outline so it doesn't look awful.
2021-06-13 15:19:08 -07:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
keronshb ed929dda12 Changes up the animation a bit 2021-06-09 15:12:22 -04:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
keronshb c1a9f9cfe9 GLOW ANIMATION 2021-05-28 17:40:43 -04:00
keronshb 86a825bb9f Space Adapt outline 2021-05-28 15:57:16 -04:00
keronshb 8f1db2d5ec Fixes some stuff
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
necromanceranne c819879473 Changes the space adaptation sprite to something more subtle. 2021-04-23 12:06:24 +10:00
siliconsandGitHub f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
Blue Wildrose d55bb8231d Buffs autotomy 2021-04-03 10:55:34 -07:00
Blue Wildrose b363cdd5ca fixes puddles, cultism checks, spellchecks 2021-04-01 04:29:35 -07:00
YakumoChenandGitHub 0b64ea1ea4 thermal is a recipe now 2021-03-13 02:50:10 +00:00
YakumoChenandGitHub 456cea91f3 thermals locked 2021-03-13 02:47:20 +00:00
YakumoChenandGitHub da303f7cf8 stimmed 2021-03-13 02:45:08 +00:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
46dbb9345d slime puddles look better and cant be abused by lings (#13567)
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-01 21:40:58 +01:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
silicons 95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
timothyteakettle 97564312e3 mindreaders know your move 2020-08-26 17:06:58 +01:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons 0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00