Commit Graph

1432 Commits

Author SHA1 Message Date
Dahlular
6c72b0e0e6 Merge remote-tracking branch 'upstream/master' into cumcom 2021-04-18 23:17:45 -06:00
Archie
d89aec9ce1 Random Parallax 2021-04-19 02:08:21 -03:00
Archie
2f7f72ea0e Archie Fix Pack 1 2021-04-18 21:07:35 -03:00
Dahlular
02dc3abcf6 Merge branch 'master' into stopbeingcringe 2021-04-17 21:26:32 -06:00
Dahlular
c55452bdb8 Disables His Grace, restricts cult items 2021-04-17 21:20:40 -06:00
Dahlular
978748b8d8 Merge pull request #1066 from lyricalpaws/master
We're off to see the wizard
2021-04-17 21:09:27 -06:00
Archie
b2fde2c0c0 Makes it so the arcane tome and clockwork slab cannot be discounted 2021-04-17 23:17:05 -03:00
QuoteFox
fb21e779b1 Nail paint cosmetics 2021-04-17 22:41:02 +01:00
QuoteFox
276a81f026 fluffy half-crop jacket. 2021-04-17 21:21:21 +01:00
QuoteFox
b776ec2b9b Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-04-17 14:28:45 +01:00
QuoteFox
37f90be2e9 y 2021-04-17 14:28:27 +01:00
Archie
447c784c0a Totally Original Reference 2021-04-17 04:25:51 -03:00
Chloe Carver-Brown
f6683fbcd3 we're off to see the wizard 2021-04-15 15:12:13 +01:00
Chloe Carver-Brown
83cbca5f07 But if you close your eyes 2021-04-15 12:25:18 +01:00
Chloe
c3a9fd127d Update job_alt_titles.dm 2021-04-15 11:27:48 +01:00
Chloe Carver-Brown
5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
Marvin Megavolt
ac7a714604 Back for round 2 2021-03-31 21:53:46 -05:00
QuoteFox
58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
QuoteFox
8cceffb594 radio in sounds. 2021-03-28 18:53:32 +01:00
QuoteFox
556e248b4c Revert "Hair_gradients part one."
This reverts commit 703ae30ec1.
2021-03-27 10:58:36 +00:00
QuoteFox
9172ee8bc8 Revert "gradient part 2, the fix"
This reverts commit a32444dae7.
2021-03-27 10:56:39 +00:00
QuoteFox
a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
QuoteFox
b81d6bccba Revert "Revert "Revert "Hair_gradients part one."""
This reverts commit c5d8bb5fb3.
2021-03-27 10:56:23 +00:00
QuoteFox
6365c7c895 Revert "the fixening or something"
This reverts commit bbd60b8c0f.
2021-03-27 10:56:20 +00:00
QuoteFox
64c8cc576f Revert "final touches."
This reverts commit 6c2ca26e86.
2021-03-27 10:56:18 +00:00
QuoteFox
bcb174eafb Revert "Merge pull request #1057 from lukevale/master"
This reverts commit 8f5ad4e860, reversing
changes made to bcc80b9800.
2021-03-27 10:56:06 +00:00
lukevale
a0de61cd90 A quick fix to saving. Should now save properly. 2021-03-26 02:30:11 -05:00
lukevale
6c2ca26e86 final touches. 2021-03-25 16:56:29 -05:00
lukevale
bbd60b8c0f the fixening or something 2021-03-25 15:01:31 -05:00
lukevale
c5d8bb5fb3 Revert "Revert "Hair_gradients part one.""
This reverts commit 90c1e4193e.
2021-03-25 14:59:57 -05:00
QuoteFox
90c1e4193e Revert "Hair_gradients part one."
This reverts commit 703ae30ec1.
2021-03-25 13:05:57 +00:00
QuoteFox
e698a8a30c Merge pull request #1051 from lukevale/master
Hair Gradients. The headache.
2021-03-25 10:58:54 +00:00
lukevale
703ae30ec1 Hair_gradients part one. 2021-03-25 04:58:38 -05:00
Dahlular
400354cc6e Merge remote-tracking branch 'upstream/master' into cumcom 2021-03-25 00:15:19 -06:00
QuoteFox
b949054b1f Merge pull request #1048 from CapnMachaddish/anti-wazard-gear
Anti wazard gear
2021-03-24 22:08:03 +00:00
QuoteFox
41c03378fc revert reverb (broken)
revert reverb bro
2021-03-23 20:37:15 +00:00
CapnMachaddish
06a38d57a2 Now available from your local interdimensional dragon shopkeeper 2021-03-23 14:25:11 -05:00
CapnMachaddish
72a3bc12a6 gloves 2021-03-23 14:05:05 -05:00
QuoteFox
35d4666715 Revert "Sounds, New Announcer, announce uses local reverb"
This reverts commit f2da13b759.
2021-03-23 18:55:58 +00:00
QuoteFox
fa3e559b78 Merge pull request #1046 from lyricalpaws/master
Adds psychologist role, changes Box med a bit
2021-03-23 18:13:40 +00:00
Chloe Carver-Brown
0620b5c682 psych job! 2021-03-23 17:21:44 +00:00
QuoteFox
38b5e5b0eb locker and jumpsuit equip sounds. 2021-03-23 16:27:18 +00:00
QuoteFox
f2da13b759 Sounds, New Announcer, announce uses local reverb 2021-03-23 15:50:11 +00:00
QuoteFox
9594a65526 areas now have reverbs 2021-03-23 10:03:03 +00:00
Dahlular
ea6beba104 Merge remote-tracking branch 'upstream/master' 2021-03-22 11:18:41 -06:00
QuoteFox
0f7d875949 Merge pull request #1040 from lukevale/master
Swimssuits, sweaters, and jackets! OH MY!
2021-03-22 16:02:35 +00:00
QuoteFox
acc67680a2 Fix Formatting in Examine window 2021-03-21 06:51:00 +00:00
lukevale
cf48916d8d final touches on the sweater. 2021-03-20 16:28:38 -05:00
lukevale
ea20010c14 Winter labcoat and virgin killer! 2021-03-20 15:17:03 -05:00
QuoteFox
0d487e3eb9 Proper fixes and returning to monkey. 2021-03-20 19:16:50 +00:00