Commit Graph

1792 Commits

Author SHA1 Message Date
kevinz000 fa0fc6ffb9 All vending machines get restocks. 2021-10-30 18:29:07 -03:00
Archie f51fb483f2 Fix v1 2021-10-30 17:55:43 -03:00
Dahlular 3cdc0d7e52 Merge pull request #1464 from ArchieBeepBoop/arrestsjacqueline
Jacqueline gets arrested
2021-10-29 18:34:57 -06:00
Archie f8436c3f29 Reverts 1019 2021-10-29 15:06:29 -03:00
Archie 2b2587572c typo fiesta 2021-10-29 14:53:21 -03:00
Archie 3b739fdae1 enthusiasm is everything 2021-10-29 14:52:26 -03:00
Archie 7873f4b4f5 Jaq commits tax fraud 2021-10-29 14:45:32 -03:00
Dahlular 97f3d419a9 Merge pull request #1462 from Chemlight/GIRTH
No more 2D Girth
2021-10-29 06:31:10 -06:00
Dahlular 3e081a798f compile fix 2021-10-29 06:25:24 -06:00
Chemlight 48715ddc3a No more 2D Girth 2021-10-29 05:13:12 -07:00
Archie 6fefccb680 Fixes it for real 2021-10-29 01:30:02 -03:00
ArchieBeepBoop b30f09153b Revert "Makes it so jacq can only TP to hallways and the library." 2021-10-29 00:56:43 -03:00
Dahlular 910314c9e6 Merge pull request #1459 from ArchieBeepBoop/halloween
[s] Another small patch
2021-10-28 21:45:06 -06:00
Archie 1f650bcf24 lesgoooo 2021-10-29 00:19:29 -03:00
Dahlular 13365e59e9 Merge pull request #1458 from ArchieBeepBoop/halloween
Makes it so jacq can only TP to hallways and the library.
2021-10-28 20:05:44 -06:00
Archie ac893bbc76 That too. 2021-10-28 23:02:44 -03:00
Archie 4e795a2d81 Hallway change for jacq 2021-10-28 23:02:08 -03:00
Dahlular 6c7167b053 Merge pull request #1456 from ArchieBeepBoop/welp
The second PR nobody asked for - The big mouse.
2021-10-28 18:33:48 -06:00
Dahlular 30c6cd28d6 Merge pull request #1455 from ArchieBeepBoop/theprnooneaskedfor
The PR nobody asked for - Coconut Cannons
2021-10-28 18:33:26 -06:00
Archie 04b8273007 No need for that 2021-10-28 03:22:59 -03:00
Archie a91d008975 The second PR nobody asked for 2021-10-28 03:19:06 -03:00
Archie d937b5bc87 The PR no one asked for 2021-10-27 17:24:41 -03:00
Archie 50ece8ed98 More additions 2021-10-26 17:13:15 -03:00
Archie d85fb3e88e Animal blacklist update for random sentience 2021-10-26 17:09:01 -03:00
kevinz000 433f4d5b3a Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2021-10-22 18:46:13 -03:00
Archie 08b09922e5 Gun balance updoot 2021-10-22 11:25:58 -03:00
Dahlular 2290bc8372 Revert "OOC Notifications" 2021-10-21 23:02:08 -06:00
Dahlular 796f210c4d Merge pull request #1438 from ProbablyCarl/OOC_Notif
OOC Notifications
2021-10-21 22:13:37 -06:00
ProbablyCarl 58597f8eec Does this work? NO IDEA 2021-10-21 21:29:31 -04:00
ProbablyCarl da0d696e42 OOC Notifications
- - -
Both joining and posting to OOC now have accompanying audio.
Additionally, joining presents everyone with a message that you've connected. An example will be provided with the PR.
2021-10-21 20:35:58 -04:00
Archie 436f1b6281 Merge remote-tracking branch 'upstream/master' 2021-10-20 23:26:05 -03:00
Dahlular 57e58af434 Merge pull request #1429 from ProbablyCarl/Gateway&MapFixups
Gateway & Map Sanitization
2021-10-20 20:01:28 -06:00
Dahlular e80318d77d Merge pull request #1428 from ArchieBeepBoop/moltov
Polychromatic Half Cloak and Polychromatic Flannel
2021-10-20 19:02:13 -06:00
ProbablyCarl f79ddc75d6 Two-fold PR.
- - -
Additions:
 - A gateway has been added for departures, rather than just having a cryopod to leave the round. Adding a new arrivals system would be nice to allow for it as another spawn point, but it's well out of the purview of this PR.
- - -
Map:
 - Shifts the kinkmate location in maint northward to allow for the gateway's area. View map-diff.
- - -
Bugfixes:
 - Sanitizes the map as best as possible using a combination of StrongDMM and self-made edits. This removes unused variables, material that caused the map to have indentation errors and replaces said material with appropriate item copies. We do not have the maps properly formatted, so this is the best that can be done without turning this into a larger PR. This is an unfortunate requirement in line with the map edit above, but it does nothing other than described.
 As a consequence, it also allows the map to actually be loaded in the Dream Daemon Environment, with no errors. Likely solves hidden issues elsewhere, too.
2021-10-20 16:12:31 -04:00
ArchieBeepBoop a7fba593b0 Merge pull request #14 from Moltovz/shit
Polychromatic half cloak
2021-10-20 13:58:41 -03:00
Chemlight 6a51ecc423 Silly roles now require the whitelist 2021-10-20 02:08:58 -07:00
Dahlular 4f9812681d Merge pull request #1426 from Chemlight/No-longer-as-random
Whitelist sillyroles place holder
2021-10-20 00:25:30 -06:00
Chemlight 3e5407cf30 Whitelist sillyroles place holder 2021-10-19 21:11:12 -07:00
ProbablyCarl f9bb4fe88c Quick sound fix/correction. 2021-10-19 21:30:33 -04:00
Dahlular 10087ded9c Merge pull request #1423 from ProbablyCarl/master
Emote Sound Additions
2021-10-19 18:45:13 -06:00
ProbablyCarl 1fe536fb19 Bat/Raccoon noises.
- - -
These are currently locked to the following:
Sounds for raccoon chittering:
 - 'Human Base'/'Mammal Base'
Sounds for bat chittering:
 - 'Human Base'/'Mammal Base'/'Avian Base'
- - -
As an addendum to the previous push, Teshari sounds are locked to:
 - 'Human Base'/'Avian Base'
2021-10-18 09:18:22 -04:00
Chemlight add0830218 Girth saves 2021-10-18 05:35:25 -07:00
ProbablyCarl cd9b06d006 Teshari Sneeze addition. 2021-10-18 07:02:16 -04:00
ProbablyCarl 161b37fa67 Emote Sound Additions
- - -
2021-10-16 10:14:09 -04:00
Dahlular eaac1aeebe Removes some garbage on the xenoarch loot pool
This is why we can't have nice things
2021-10-15 03:24:23 -06:00
Chemlight 304675cb08 Backgrounds and GIRTH 2021-10-14 05:46:27 -07:00
!Moltov! 26433c5270 Fixes a fucking punctuation error
fixes something that would break clothesmates
2021-10-13 11:45:14 -04:00
!Moltov! 20f81c5715 adds to vendor 2021-10-13 11:42:00 -04:00
Chemlight 66ba0e27f6 ZaoCorp Part 1.1 2021-10-13 00:48:50 -07:00
Moltov 27b9098973 puts it in a clothesmate 2021-10-12 22:43:50 -04:00