Commit Graph

65 Commits

Author SHA1 Message Date
sarcoph 818fcedad6 cards part 1 2022-04-24 20:28:30 -08:00
kevinz000 fa0fc6ffb9 All vending machines get restocks. 2021-10-30 18:29:07 -03: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
quotefox 8fd8ea5380 Denbu Draft - Butt enhancer, stocked in kinkmates
Just like other genital enhancers, you now have a backside enhancer.
2021-09-13 21:15:45 +01:00
kevinz000 21c3b8e67b Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
2021-07-15 17:56:19 -03:00
SaintHusky ed5f2ba714 Slutty Nurse outfit 2021-05-12 19:53:05 +02:00
QuoteFox 3640442cb7 Latex Outfits, Bulge System for clothes 2021-05-11 02:25:15 +01:00
QuoteFox bee56ad0f6 Portal Fleshlights 2021-04-16 20:40:01 +01:00
QuoteFox 1d6d72e613 Customizable Fleshlights.
Now you have fleshlights. That can be customized in colour and style!
2021-04-15 20:57:22 +01:00
Chloe Carver-Brown 83cbca5f07 But if you close your eyes 2021-04-15 12:25:18 +01:00
lukevale 2039aa1f10 finishing touches to the new clothing 2021-03-21 18:51:57 -05:00
QuoteFox 9cf0ca814b Revert "some fixes!"
This reverts commit 0c5effbc7b.
2021-03-20 19:01:30 +00:00
QuoteFox 0c5effbc7b some fixes!
some fixes!
2021-03-20 16:32:29 +00:00
DragonTrance ae9b09a118 more loadout preferences 2021-03-09 09:50:07 -07:00
DragonTrance 37c00d0481 Update cryopod.dm 2021-02-23 18:51:57 -07:00
Chemlight d47af9c25c Syndicate stuff
Lets start if off right off the bat, chameleon masks from lavaland syndicate and (hopefully)  space comms agents no longer have a GPS.

Flavor text for the syndicate ghost roles more tie into a don't leave rather than abandon, while hinting Kinaris is also an enemy much like NT, just not that much of a threat (think cold war).

Lastly anyone with the mind.special_role ROLE_TRAITOR will get a notification about ahelping before cryoing.
2021-02-11 05:50:58 -08:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox c0de8ec3ac some prices and lights I forgot. 2021-02-04 13:10:16 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
QuoteFox 99318f201f adds stole to kinkmate.
adds stole to kinkmate.
2021-01-30 03:38:23 +00:00
QuoteFox 3772bbbcc5 vibrators and code optimization! 2021-01-28 01:36:37 +00:00
QuoteFox 01adee44c0 Merge pull request #866 from iloveyoulots/vendorhelp
Increase amount of fetish items in kinkmate and makes fake handcuffs properly appear.
2021-01-16 20:39:16 +00:00
QuoteFox 83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
iloveyoulots 900fa895c9 fixes fake cuffs in the kinkmate 2021-01-13 02:03:56 +00:00
iloveyoulots 784c08dc75 increases kinkmate contraband amounts 2021-01-13 02:03:10 +00:00
Ghom ca735a752e Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2021-01-06 14:57:15 -03:00
Lin 6ef6d21a84 Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
2021-01-05 17:23:36 -03:00
QuoteFox 970d4e20fc Merge pull request #802 from DragonTrance/syndie-cryo
Lavaland Syndicate Cryo Pod
2021-01-02 13:40:26 +00:00
DragonTrance 0fa9b23db7 runtime squash 2021-01-01 12:22:29 -07:00
DragonTrance 76b04095ee adds cryopods in syndicate base 2021-01-01 12:19:53 -07:00
DragonTrance 7753acc547 forgot one thing 2020-12-29 11:27:53 -07:00
DragonTrance d6c6c80578 rahh 2020-12-29 11:23:08 -07:00
DragonTrance 529824b320 borg expander + vtec upgrades fix 2020-12-29 11:15:19 -07:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular 4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
Dahlular 40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00
DragonTrance f976eee3df 6 (?) 2020-11-22 14:39:12 -07:00
kevinz000 c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
kevinz000 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Kabra_men fd44d1a9fd Fix PR #584 and some additions for lockers and kink vendor 2020-10-23 23:19:34 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Lin e0d9a3b354 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2020-10-12 23:47:58 -03:00
Dahlular 0756155230 Merge pull request #564 from Kabramen/sounding
Sounding Rod
2020-10-10 23:16:24 -06:00
Kabra_men ab2c32decd Sounding Rod 2020-10-07 19:11:18 -03:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Dip 1f633a5bbe removes a clause that has no effect on local variable 2020-09-26 19:39:47 -03:00
Unknown 1527edfa6b how could i forget the collars? 2020-09-04 15:07:49 -05:00
Unknown cadab7c519 mmmmph! 2020-08-30 18:12:56 -05:00
QuoteFox ac03f4865b Merge pull request #383 from Kabramen/more-stuff-+-clown-masks
New items+ loadout changes + new clown mask types
2020-08-10 10:04:07 +01:00
JaySparrow 99326d6303 Alternate Job Titles fix
Speak up announcer bot, please.
2020-08-07 20:28:48 -05:00