Commit Graph

2022 Commits

Author SHA1 Message Date
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
Dahlular 9ace823a70 Merge pull request #1063 from lyricalpaws/master
A bunch of shit and fuck (Actually useful)
2021-04-15 04:32:24 -06:00
Chloe c3a9fd127d Update job_alt_titles.dm 2021-04-15 11:27:48 +01:00
Archie 36f265aea7 Nothing Here 2021-04-12 11:18:50 -03:00
Chloe Carver-Brown 5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
QuoteFox bd507efe08 Merge pull request #1062 from Chemlight/Centcom-helpies
Message to Centcom
2021-04-05 18:44:23 +01:00
QuoteFox fb1d89a803 Merge pull request #1059 from CapnMachaddish/guncaster-take-2
Guncaster outfit fix
2021-04-05 18:44:14 +01:00
Chemlight 48cddaaf51 Message to Centcom
"Please send help, I don't know how I'm contacting you without captain access, but it would sure be nice about now!"

Simply enough made it so anyone who can access the communications console normally can message Central Command.
2021-04-05 01:47:32 -07:00
Chemlight 4d87d4524a Antag role changes
First of all removed Lewd Traitor from the round start as well as mid round system, leaving it only as a admin given role as the role itself is stilla WIP, further more pumped up the play time requirement with antags to 3 weeks (21 days).
2021-04-04 02:02:09 -07:00
Marvin Megavolt ac7a714604 Back for round 2 2021-03-31 21:53:46 -05:00
QuoteFox 275438d526 reduce radio volume
reduce radio volume
2021-03-28 23:18:27 +01: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 99f861a512 new plating and shelves 2021-03-28 16:48:02 +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
QuoteFox 8f5ad4e860 Merge pull request #1057 from lukevale/master
A quick fix to saving. Should now save properly.
2021-03-26 13:41:32 +00:00
lukevale a0de61cd90 A quick fix to saving. Should now save properly. 2021-03-26 02:30:11 -05:00
QuoteFox bf7abb778d Revert "Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist""
This reverts commit 04d01ed851.
2021-03-26 06:00:13 +00:00
QuoteFox 04d01ed851 Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist"
This reverts commit 5488e82e13, reversing
changes made to fa04b528f9.
2021-03-26 05:59:30 +00:00
QuoteFox 5488e82e13 Merge pull request #1055 from DragonTrance/apparition-antagonist
Wendigo (Early/Testing Stages)
2021-03-26 05:44:39 +00:00
DragonTrance 1e3c4b91d6 wendigo antag (admemery atm) 2021-03-25 22:29:29 -07:00
QuoteFox e57ff2e49c Merge pull request #1054 from CapnMachaddish/Door-Sounds-2.1
New door sounds, take 2
2021-03-26 02:44:46 +00:00
CapnMachaddish 786b05579c Doors and corners, kid... doors and corners. 2021-03-25 20:00:23 -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 a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +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
QuoteFox b949054b1f Merge pull request #1048 from CapnMachaddish/anti-wazard-gear
Anti wazard gear
2021-03-24 22:08:03 +00:00
QuoteFox 8e15edf08a cigs no longer make a mountain of ash when put out. 2021-03-24 11:53:01 +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