Commit Graph

140 Commits

Author SHA1 Message Date
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01: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 c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
silicons ec01dc69ac Merge pull request #15642 from deathride58/multblood
Multiplicative blood
2022-06-01 15:14:09 -07:00
TrojanCoyote 0a724a44a6 Kitsune masks
black and white kitsune masks
2022-05-30 22:25:24 -05: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 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
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Timothy Teakettle c9051a6a08 adds polychromic clown outfit and mask (#15359)
* why

* polyclown

* outfit / loadout / etc

* its not pink what do you mean

* newline

* fixes

* test icon diffs
2022-02-18 14:38:50 -08:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
keronshb 0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
Fabian 2c0ffca75c Update miscellaneous.dm 2021-03-25 14:26:18 +01:00
dzahlus 83102b056b Update miscellaneous.dm 2021-03-24 19:14:52 +01:00
Fabian 989ed923d8 accidental powergame armor removal 2021-03-23 20:02:07 +01:00
Fabian 4a5827662c you now get to change your mask at any time not just once 2021-03-13 22:29:05 +01:00
Fabian 1ca1ccfc36 unapologetic joy mask buff 2021-03-13 21:52:23 +01:00
Fabian bb4459ef5e flushed pensive angry 2021-03-13 21:24:29 +01:00
Fabian 036ba24545 flooshed? 2021-03-13 20:17:01 +01:00
zeroisthebiggay 0c0ff44c23 pog
pog
2021-02-07 22:01:57 -05:00
zeroisthebiggay 0bc8c9383c Update miscellaneous.dm 2021-01-26 13:17:44 -05:00
zerothebigboy 7b2a6955cc please 2021-01-26 13:13:09 -05:00
Blue Wildrose 381f27c5b1 will this work? 2021-01-18 14:28:16 -07:00
Blue Wildrose 5173a7f790 *SCREAM 2021-01-18 14:25:44 -07:00
Blue Wildrose c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
timothyteakettle 2c01acd5f5 important 2020-11-26 22:52:58 +00:00
timothyteakettle e8c2b7d2a6 gas mask adjusting 2020-11-26 01:03:00 +00:00
Ghom 5d0e26e9a1 Quick clown/mime masks designs fix. 2020-10-23 18:08:54 +02:00
Ghom b893e40494 Update gasmask.dm 2020-10-16 20:57:08 +02:00
Ghommie c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
Hatterhat 9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
lolman360 4259332cfd e 2020-08-19 18:37:31 +10:00
silicons d946998fb9 Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
2020-07-23 16:18:17 -07:00
timothyteakettle ed1e8c4221 support for masks 2020-07-22 15:43:58 +01:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Timothy Teakettle 7f2155ea2e fix sprite 2020-06-15 21:44:18 +01:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Ghom 85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
Ghommie 88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Ghommie 42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00