Commit Graph
18 Commits
Author SHA1 Message Date
WoolyAypa 36f8a4ea71 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-04-26 16:12:15 -03:00
CreepingRose bdb6008f74 Adds the Ultimate Spray Bottle, a 750u bottle sprays 5 tiles away. Additionally makes the Bluespace Spray Bottle printable in the Service Techfab 2023-04-03 18:31:14 -04:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
AshTheDergandGitHub 221283c313 Borg Shaker Fix 2023-01-27 15:12:54 -05:00
AshTheDergandGitHub df98398060 Borg Shaker Fix 2023-01-27 14:00:50 -05:00
AshTheDergandGitHub b3a4d968ba More Shaker Fix 2023-01-27 13:35:20 -05:00
AshTheDergandGitHub 6e67b60d6e Borg Shaker Fix
I fix it.
2023-01-27 13:23:25 -05:00
WoolyAypa 4cd6975b3b conflictos 2023-01-18 21:27:19 -03:00
Darius ad0239b5de Replace all modular HTML spans with defines spans
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
2023-01-16 04:05:27 -05:00
Darius 64ef8148c8 Plushmium crate updates
- Reduces the amount from 30 to 5
- - Allows converting only one plushie per shipment
- Adds a spray bottle variant
- Prevents using the spray bottle on non-plushies
- Adds a boxed set for the items
- Adds a lore note explaining how to use it
- Updates shipment information
2023-01-13 21:40:21 -05:00
Darius c8acb8c218 Adds a Plushmium Crate to cargo
Adds the new Plushmium Crate, which contains a bottle of Plushmium and a plushie choice box. Also adds an item for the Plushmium Bottle, so it can be in the crate.
2023-01-10 14:28:51 -05:00
WoolyAypa 832d682250 newline :)))) 2022-12-13 17:29:41 -03:00
WoolyAypa b1c288d267 help! 2022-12-12 12:38:18 -03:00
BongaTheProto bf2cd05560 lewd medipens
adds lewd donator medipens like that one donator asked for
2022-08-14 03:31:20 -05:00
BongaTheProto 557fbe7803 back home
this works apparently...?
2022-04-18 21:19:35 -05:00
BongaTheProto 0293cf9485 update 2022-03-31 00:15:18 -05:00
BongaTheProto bdcbb08719 Psycho
https://github.com/quotefox/Hyper-Station-13/pull/1046
https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11180 (mostly used this one to guide myself on adding it, idk why it was removed from the commit in first place)
2022-03-19 12:27:04 -05:00
James ec54dacb23 Lots of changes
Adds fan to stop air escaping
Adds turrets to slave shuttle, default setting to stun
Adds a few more buyable slave shipments
Modifies shipment costs to be cheaper
Stops the station from being able to spam the slaver comms by rapidly buying/unbuying a slave
Allows the slavers to edit a slave's price
using the traitor panel to add slaver status to a player no longer teleports them to the slaver spawn or wipes their existing gear.

And other stuff I can't remember
2022-01-29 22:54:09 +00:00