68713535ba
clearer love dice descriptions
2022-04-25 23:40:03 -08:00
29e53d1cc3
fix failed merge bug
...
if you merged cards but they were incompatible decks it would delete the cards. this stops it from doing that
2022-04-25 23:19:47 -08:00
f196c61606
Merge branch 'master' into misc-recreation
2022-04-25 23:06:45 -08:00
104a26dea8
fuck it
2022-04-25 23:00:05 -08:00
157024ee94
base cards done
2022-04-25 22:02:09 -08:00
10bb6b0c3b
Merge pull request #1516 from ArchieBeepBoop/spook
...
[s] Spooky Element
2022-04-25 12:52:27 -06:00
6ef2eae8cd
Overalls fix and Lewd Overalls
...
Fixes the Digi-Legs Overalls that can be bought from vendors. Also adds 'Form Fitting Overalls' A pair of overalls that can be worn on the suit slot and has the same functionality as the Latex Bodysuit.
2022-04-25 17:26:12 +01:00
818fcedad6
cards part 1
2022-04-24 20:28:30 -08:00
f76ca53065
modularises
...
FINALLY finished modularising the code,,
2022-04-24 15:40:50 +10:00
fff0006124
Kalyna
...
Adds Kalyna plants, drinks, and berries.
2022-04-24 13:28:07 +10:00
ef834032fa
Racc Marking Alt
...
Changes the Secondary and Tertiary marking colors on the Raccoon Body Marking. Also some slight edits to the digitigrade socks to please my gremlin brain.
2022-04-20 18:06:39 +01:00
7b3d77ed1c
Merge remote-tracking branch 'upstream/master' into spook
2022-04-20 01:50:11 -03:00
02d4ae2138
Pellucyte Fixes
2022-04-20 01:44:44 -03:00
235c2e487e
Normalizing Jewelry
2022-04-18 04:20:08 -06:00
0fcb808fc3
Merge pull request #1580 from ProbablyCarl/master
...
Oh God Oh Fuck
2022-04-10 08:18:41 -06:00
61ca092a24
Oh God Oh Fuck
...
Emergency hotfix for a misnamed path.
Without this, the reactor is scuffed and spews radiation. Bugs ahoy.
2022-04-10 10:17:00 -04:00
1856a47478
Additional sprite updates
2022-04-09 07:02:57 -07:00
355a67e6f0
New Lavaland Ruin | Misc Reactor Fluff
...
- - -
Adds an unstable ruin filled with radiation and xenomorphs to mining.
There's little to nothing of value within, other than two potential alien corpses and a singular living facehugger spawn.
It's more of a fluff area than anything.
Alongside this, it also adds an object that administrative staff can spawn, which is more-or-less just a reactor that has undergone meltdown without the negative effects. Radiation not included in those 'negative effects'. Primarily for event stuff without having to proc call for a meltdown or fiddle with icons.
2022-04-09 07:29:07 -04:00
91345205d4
Modularized lorebooks and redid welcome to kinaris
2022-04-04 20:25:37 -06:00
acbb12c867
new lore in ATC
2022-03-31 08:41:43 -06:00
fb6d24d040
Pain 0.3
2022-03-28 09:45:52 +01:00
070177b767
New Emo Haircut.
2022-03-27 17:32:12 +01:00
979cd1fd48
Pain 0.2
2022-03-27 14:12:54 +01:00
1d71999e48
another fix.
2022-03-26 14:01:37 +00:00
fb59290f7c
people asleep, never go into shock. for medical.
2022-03-26 13:54:49 +00:00
91fdb7c4ae
fix
...
fix
2022-03-26 13:32:52 +00:00
dff8c4ab28
Maso trait, kisses heal alittle pain...
2022-03-26 13:30:53 +00:00
b46aabb922
fix, dont stutter for 30 seconds jesus.
2022-03-26 12:40:16 +00:00
2ff6b41e2d
pain hud display
2022-03-26 12:34:02 +00:00
de8caa4724
PAIN
2022-03-26 11:07:42 +00:00
ec22cfc5c6
2 new hair styles (Side hair and glamour)
2022-03-25 20:13:25 +00:00
b1aed814e5
file fix, sound fix, death added
2022-03-07 14:08:03 +00:00
f02701b01b
spawn reduced abit
2022-03-07 13:36:03 +00:00
bf1a5d7de1
name fix
2022-03-07 13:34:57 +00:00
85adc2dd72
Crystal Enemies
2022-03-07 13:31:02 +00:00
30f6e0709b
Merge pull request #1546 from sarcoph/update-tgui
...
tgui-next => tgui3
2022-03-06 18:19:16 -07:00
a4b495a325
Merge pull request #1548 from sarcoph/bird-additions
...
insect resprites and customization options
2022-03-06 18:04:42 -07:00
30f5a63f96
fixed beetle wings
2022-03-06 10:47:30 -09:00
8a1d94a081
beetle wings
2022-03-06 10:46:56 -09:00
f2855bf5ec
tails, antennae, wings, and fluffier bees
2022-03-06 04:03:53 -09:00
0630aece96
insect overhaul + bee/moth markings
2022-03-06 00:26:07 -09:00
392372edf7
Merge pull request #1547 from sarcoph/bird-additions
...
more body parts for bugs and winged characters
2022-03-06 01:16:43 -07:00
42a97fea26
more body parts for bugs, winged chars
2022-03-04 18:08:58 -09:00
44ab0283e9
Merge branch 'update-tgui' of https://github.com/sarcoph/Hyper-Station-13 into update-tgui
2022-02-27 11:58:31 -09:00
ba4c250479
moving unused tguis + minor refactors
2022-02-27 11:58:18 -09:00
bae0b9e1ab
Merge branch 'master' of git://github.com/quotefox/Hyper-Station-13 into quotefox-master
2022-02-27 01:49:37 -09:00
66962a8816
first attempt at implementing TGUI 3
...
trying to update from TGUI Next to TGUI 3, so we can later upgrade from TGUI 3 to TGUI 4.
2022-02-26 16:43:25 -09:00
6fb58ad15f
Come yourself
2022-02-25 06:55:30 -08:00
e05d1085d4
convert avian feather crest to hairstyle
...
also moved the other hyper hairs into the new file
2022-01-09 22:14:34 -05:00
a3b3053ca7
shrike markings, split into hyperstation folder
...
latter is done at aura's recommendation, so now there's a file for hyperstation sprite accessories
2022-01-09 21:42:13 -05:00
sarcoph