Commit Graph

694 Commits

Author SHA1 Message Date
DragonTrance 42f4fe1721 i probably should resolve conflicts with desktop 2021-04-20 01:18:01 -07:00
DragonTrance 20e2c2fcea Merge branch 'master' into various-fixes 2021-04-20 00:56:44 -07:00
DragonTrance b4039d7cbb various fixes v2
1 - Loadout items no longer duplicate backpack items, and all items get stored into backpacks properly
2 - Fixed a runtime with captain's job on roundstart. They will now be announced when they join at the start of the shift.
3 - Fixed filter runtime when transferring ckeys
4 - Economy SS no longer fires, so it will no longer clutter runtime logs
5 - Fixed laughing peas not being able to be taken out of seed extractors by lazily renaming them
2021-04-20 00:52:33 -07:00
Archie d89aec9ce1 Random Parallax 2021-04-19 02:08:21 -03: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
QuoteFox fb21e779b1 Nail paint cosmetics 2021-04-17 22:41:02 +01:00
Chloe Carver-Brown f6683fbcd3 we're off to see the wizard 2021-04-15 15:12:13 +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
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
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
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 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 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
QuoteFox a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +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
QuoteFox 92f281373d Revert "Merge pull request #1045 from CapnMachaddish/door-sounds-2.0"
This reverts commit 43a0ce2b0a, reversing
changes made to 9594a65526.
2021-03-23 18:56:27 +00: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 43a0ce2b0a Merge pull request #1045 from CapnMachaddish/door-sounds-2.0
Door sounds 2.0
2021-03-23 15:47:52 +00:00
CapnMachaddish efafab1b72 even more doors 2021-03-23 10:27:02 -05:00
CapnMachaddish b8b033ee5b EVEN MORE 2021-03-23 07:17:36 -05:00
CapnMachaddish b165c3c7a1 hehe 2021-03-23 05:41:05 -05:00
QuoteFox 9594a65526 areas now have reverbs 2021-03-23 10:03:03 +00:00
QuoteFox 9cf0ca814b Revert "some fixes!"
This reverts commit 0c5effbc7b.
2021-03-20 19:01:30 +00:00
QuoteFox 5dbf439e0b Revert "lets not rip a hole in space time."
This reverts commit 9d16326f34.
2021-03-20 19:00:47 +00:00
QuoteFox 9d16326f34 lets not rip a hole in space time. 2021-03-20 16:35:46 +00:00
QuoteFox 0c5effbc7b some fixes!
some fixes!
2021-03-20 16:32:29 +00:00
QuoteFox 706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
DragonTrance 11a41d1bc1 Revert "fixes various bugs and runtimes"
This reverts commit 9860480e91.
2021-03-18 11:19:37 -07:00
QuoteFox 42b1d15981 Revert "Merge pull request #1035 from DragonTrance/various-fixes"
This reverts commit 8436f16c54, reversing
changes made to f512b6d42e.
2021-03-17 23:45:38 +00:00
DragonTrance 9860480e91 fixes various bugs and runtimes 2021-03-17 12:31:18 -07:00
QuoteFox 389d83ba99 Merge pull request #1017 from DragonTrance/flags
Mob biotype optimization
2021-03-05 13:23:13 +00:00
DragonTrance 4b931c5e92 mob_biotypes are now flags instead of lists 2021-03-03 11:08:36 -07:00
DragonTrance a336b3086f trays hold more + donk pockets store correctly 2021-03-02 00:43:08 -07:00
QuoteFox e9af7704d9 Merge pull request #1005 from Kabramen/more-augments
bimbo augmentation
2021-02-28 04:41:09 +00:00
QuoteFox 74fd8d8f13 Stat panel fixes (Not done) 2021-02-28 03:58:07 +00:00
Kabra_men 17b731a2a5 bimbo augs 2021-02-27 23:31:32 -03:00
QuoteFox 6ca9ac4123 Revert "Revert "Tg status tab""
This reverts commit b4fa877cc7.
2021-02-27 04:30:52 +00:00
QuoteFox b4fa877cc7 Revert "Tg status tab"
This reverts commit 931f3ca63b.
2021-02-27 04:02:22 +00:00
QuoteFox 931f3ca63b Tg status tab
finally.
2021-02-27 01:47:19 +00:00