juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,982 Commits 57 Branches 0 Tags
f789de2cd3dd5259fa4677e09521cf076b0645ea
Commit Graph

1446 Commits

Author SHA1 Message Date
potato1234_x
6abb55088c CuraDrobe + Misc Librarian Stuff (#19469) 
* sprites

* stuff

* jumpsuit sprites

* jumpskirt sprites

* fix 2

* CLOTHING FIX 2 IM LOSING MY MIND

* contrast 2

* update 239
 2023-10-10 11:55:30 -05:00
brainfood1183
ad17adfb63 Polymorph Artifact Effect (#20660) 
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-10-09 16:49:42 -07:00
Nemanja
25a6912667 Reformat hand examine text (#20842) 2023-10-08 14:01:18 -07:00
coolmankid12345
0a7338c0fe Minor Rev changes (#20771) 
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
 2023-10-06 15:41:26 +11:00
KingFroozy
9542177fe3 shouldlength overeye hairstyle (#20757) 2023-10-05 15:15:24 -06:00
deltanedas
a365568a7a give revs briefing (#20749) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-10-05 08:05:09 -07:00
Bloody2372
c7cf6764ee Add "Two Strands" hair (#20730) 
Co-authored-by: Илья Стокалюк <darkelement237@mail.ru>
 2023-10-05 03:11:27 -06:00
DrSmugleaf
5f0b665f0e Fix printing $username at round end for head revs when it doesn't have a session (#20742) 2023-10-04 23:22:30 -06:00
Raphael Bertoche
c1cfe8d45e Removes unnecessary message for defibbing a patient which has ghosted (#20690) 
* Removes unnecessary message for defibbing a patient which has ghosted

This message is for the defib operator.

It could inform them that the patient doesn't have a consciousness since it's ghosted
but maybe no message is really the right move here because it may have succeeded
and that would be what would happen had the defib attempt succeeded - no message.

Also when the patient's ghost return to body there they will be alive as long as the
body is still alive, so telling the operator to defib again may be wrong.

* Removes corresponding ftl message which doesn't occur now
 2023-10-04 21:47:41 -04:00
coolmankid12345
9df5ded9ad Revolutionaries (#18477) 
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2023-10-04 18:47:33 -07:00
I.K
dc95582679 Make forcing others into disposals take longer and more apparent (#20687) 2023-10-02 11:35:58 -08:00
deltanedas
4c46273303 Add rolling pins for flattening dough (#20624) 2023-10-02 11:21:15 -08:00
Ubaser
10c2db4830 New Kobold Ears marking for lizards (#20672) 2023-10-02 18:08:20 +11:00
deltanedas
3488e577d9 Electric grill (#20661) 
---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-10-01 19:17:50 -05:00
Nairod
fcdedb377d Practice Ammunition Tech (#20331) 2023-10-01 13:18:05 -07:00
deltanedas
94a11f28ca dragon refactor, objectives and use GenericAntag (#20201) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-30 13:18:01 -07:00
Kara
80f36ea6d4 Glorfcode (force say on damage/stun/crit) (#20562) 2023-09-28 18:05:36 -07:00
lunarcomets
d348096ef2 archaic accent tweaks (#20567) 2023-09-28 12:19:58 -07:00
Psychpsyo
008f2d9d1c Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) 
* Explosive wet floor sign & janitorial suicide vest

* fix attributions

* Remove name & desc from explosive wet floor sign

* Make wet floor sign chameleonable
 2023-09-28 00:09:44 -04:00
deltanedas
0d22d2d1f2 rouny meat and steak (#20526) 
* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-28 00:07:08 -04:00
Psychpsyo
25315a0e23 fix bingus wrinkly head (#20531) 2023-09-28 00:06:13 -04:00
Ubaser
527485f00d 4 new Lizard Horn markings (#20496) 
* add images to .rsi

* Revert "add images to .rsi"

This reverts commit afa891ee9456c35dd88d5baa4269568286282955.

* add images to .rsi (for real now)

* other misc files
 2023-09-25 22:24:09 -04:00
TomaszKawalec
cd9f0b8728 Display minimum temperature required for reaction to occur in guidebook (#20424) 2023-09-24 17:33:25 -04:00
Kara
fb175a520d Ghost hearing action (#19722) 2023-09-24 16:34:08 -04:00
csqrb
7bb3dd09c7 After killing all nuclear operatives, shuttle will be called instead of instant round end (#19850) 
* ☢️🕵️💀🚫📄🚀

* 🚀📢❌📥📜

* 🔧🐛📢🚹🚉➡👑👑

* 😪

* 🧱

* 🚀🛬🕔➡️🕙

* ☢️⚙️🔵🔚🔨➡️🔵🔚⚙️

these commit names are literally evil who tf does this
 2023-09-24 16:16:33 -04:00
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292) 
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
 2023-09-24 15:57:10 -04:00
PixelTK
ec05e229ba new arachnid marking (#20347) 2023-09-24 15:54:38 -04:00
Nemanja
d225bd39fa basic station event commands (#20371) 
* basic station event commands

* ouagh
 2023-09-24 12:46:35 -05:00
deltanedas
b7cff81587 Openable refactor (#19750) 2023-09-22 22:10:04 -04:00
DrSmugleaf
71ab660885 Add role bans tab to the bans admin window (#20388) 2023-09-22 14:08:28 -07:00
Nemanja
f16ff3a2d9 Rat King Milsim + Buffs (#20190) 
* rat king update

* rummaging

* buuuuunnnnncccchhh of shit

* the last of it

* make rat servants not ghost roles

* pissma buff and cooldown
 2023-09-22 15:01:05 -05:00
deltanedas
37c5020a71 move ninja objectives code into generic antag system (#20186) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-21 07:33:18 -07:00
ike709
3ee729f3fd Adds a search bar to vending machines (#20326) 
* Adds a search bar to vending machines

* fix indentation

* whitespace again

---------

Co-authored-by: ike709 <ike709@github.com>
 2023-09-20 15:40:41 -04:00
deltanedas
4fbebb6917 Roundstart antag role restrictions revival (#20108) 
Co-authored-by: Ray <vigersray@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-20 17:54:53 +10:00
dahnte
7631b66c69 Added lisp as a character trait (#20350) 2023-09-19 21:51:50 -07:00
metalgearsloth
036b9ef74f Expeditions rework (#18960) 2023-09-19 22:52:01 +10:00
Nemanja
fdbadbe579 closet skeleton event (#19802) 2023-09-19 15:05:17 +10:00
Doru991
fcfe75a308 New crops: Berries and Bungo (#19800) 
* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops
 2023-09-18 23:29:27 -04:00
Nemanja
06ad5221ee decal settings (#20324) 2023-09-18 17:17:48 -06:00
deltanedas
5f11646f20 add binary translator key to uplink (#20295) 
* add binary translator key

* add binary translator key to uplink

* grammar

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-18 13:20:56 -06:00
deltanedas
fc6638d7e0 gateway changes (#20304) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-18 11:09:21 +10:00
DrSmugleaf
bb655ab4a5 Resize the non-admin AHelp window to be taller and less wide (#20271) 2023-09-17 04:04:20 -05:00
deltanedas
621e102c93 refactor nukeops rule a bit (#19792) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-16 21:48:42 +10:00
deltanedas
f7711edbe3 Objectives ecs rework (#19967) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-16 16:18:10 +10:00
deltanedas
e8c58d1574 Microwaved pais get scrambled name + randomly bricked (#19982) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-16 16:07:36 +10:00
Leon Friedrich
f7d7f5cc7f Rename DummyPuppet to VentriloquistPuppet (#19777) 2023-09-16 14:54:46 +10:00
Leon Friedrich
411fc8e27b Improve vv /c/enthover and add keybind (#20127) 2023-09-16 14:09:51 +10:00
Doru991
eaecdb4336 Cyborg health alert and damage examining (#20084) 
* Option for alt health alert and no overlay

* Fancy borg health indicator

* Borg damage examine localization

* EENENGHHHH ENNNGHHH

* Requested code changes

* Legal sound

* Revert "Legal sound"

This reverts commit 35715c88898aeb78dfe800319852c230395fdd7e.

I misunderstood what Sloth meant

* Annoying buzzer is back
 2023-09-14 23:14:47 -04:00
DrSmugleaf
6728077bc7 Fix missing localization for bibles, crit, internals, mime, sleeping and voice mask (#20131) 2023-09-14 03:08:03 -07:00
Doru991
3f51795cc7 Add plant species mutations (#19960) 2023-09-13 20:56:24 -08:00