Commit Graph
5276 Commits
Author SHA1 Message Date
TheFurryFeline fd451c267f Part 3
Final commit, T-comms network refactor, Jellybrig mob addition, p90 ammo cartidges in Red Armoury, and more. Edit history in summary of PR will show changes of key points.
2019-10-26 07:07:41 -04:00
RazgrizandGitHub 4c86d30af3 Merge pull request #823 from TheFurryFeline/patch-23
Global Output of User is, BEGONE! OUTTA MY SIGHT
2019-10-07 04:34:04 -07:00
TheFurryFelineandGitHub 8b0ac4ad31 Timeclock Output Fix
Removes the thing I tried to add for counting how many minutes left until you're able to switch again.
2019-10-04 01:06:35 -04:00
TheFurryFeline 625316f163 Nevermind.
Remove the to_chat I added. Just plain comments out the world << testing message that was left in by Ater at Polaris.
2019-10-02 23:14:53 -04:00
TheFurryFelineandGitHub 67c22b2d70 Global Output of User is, BEGONE! OUTTA MY SIGHT
Fixes laptops to not literally give everyone the message when someone's actually using a laptop and fiddling around with the cardslot functions.
2019-10-02 19:43:58 -04:00
SharkmareandGitHub 17c5daa6a2 Update buttons.dm 2019-09-29 11:04:11 +02:00
SharkmareandGitHub 41eabec38c Update buttons.dm 2019-09-28 12:18:01 +02:00
SharkmareandGitHub edd423cfa6 SPECIAL BUTTON CODE CLEANUP 2019-09-28 10:56:52 +02:00
SharkmareandGitHub da95cb7153 Fixing loot spawning of Dare Button
Priorly incorrectly assigned loot drops to button LOC instead of user LOC
Woops!
2019-09-28 10:49:05 +02:00
TheFurryFeline d3a48f8e40 Fix Roundstart Runtimes
Title: Casino had a few more reagents that weren't labelled correctly for carrotjuice, applejuice, tomatojuice. beepsky_smash refactored to beepskysmash as well as royrogers.
2019-09-24 11:38:57 -04:00
HiziaanandGitHub 2d511dd76d Merge pull request #789 from Shadowfire117/master
Casino 2: The gambling boogaloo!
2019-08-31 09:42:44 -05:00
Shadowfire c716971fb4 Casino 2: The gambling boogaloo!
-	Added walls around casino in space, come on people youre not supposed to spacewalk and steal from it...
-	A new wall dispenser that gives space cleaner, perfect for janitors on luxury cruisers and casinos
-	Relay on casino, so finally folks can talk without event manager having to panic about lack of comms >>
-	Platinum chip can now be flipped like a coin!
-	Wallets can now hold casino chips and platinum coin, and theres also a casino wallet that can change between 3 designs
-	Theres now a casino chip exchanger, only accepts cash and doesnt give back change!
-	Casino now has curtains for some tables so not everyone screams into each others ears
-	redefined casino manual to include self betting, reduced sentient prize cost, taken out rules with usage of joker card, added group blackjack and Cards against the galaxy.
2019-08-31 12:59:14 +02:00
kcin2001 9d73a43212 adds 10 "certified bellybrig" badges to secvend 2019-08-26 14:40:25 -07:00
SharkmareandGitHub e46e9e28f8 Update buttons.dm 2019-08-22 12:55:30 +02:00
SharkmareandGitHub 9ea5ddeba7 Dare/Chaos button Restructure 2019-08-22 12:53:27 +02:00
SharkmareandGitHub e83306b8ad include casino 2019-08-19 14:28:20 +02:00
SharkmareandGitHub d9ea50b97c RIG 2019-08-19 14:25:00 +02:00
SharkmareandGitHub 5c81200266 VAR FIX 2019-08-19 14:22:13 +02:00
SharkmareandGitHub 630c3b613b New Dare results.
Switchblades, Syringes, Shady looking size guns.

More bad results to balance the good.

Randomization now operates differently.

sahoc rising.
2019-08-19 14:11:34 +02:00
RazgrizandGitHub 42b1d05077 Merge pull request #758 from Sharkmare/patch-87
Optimize Chaos button, add Dare button
2019-08-12 01:54:42 -07:00
RazgrizandGitHub c922de297c Merge pull request #757 from Sharkmare/patch-85
Fixing indents
2019-08-12 01:52:30 -07:00
Shadowfire 846f35bb70 Final commit for casino! 2019-08-10 19:51:32 +02:00
Shadowfire 42ecd91c8c Some last minute changes to casino! 2019-08-10 14:21:35 +02:00
SharkmareandGitHub 3a109f3fed Update buttons.dm 2019-08-09 13:06:17 +02:00
SharkmareandGitHub 621bc3cde5 Optimize Chaos button, add Dare button
Dare button when pressed will cause a random thing to happen
code should be finished.

possible additions: more results, flavor text
2019-08-09 12:57:54 +02:00
SharkmareandGitHub f47d75c579 Fixing indents 2019-08-09 09:21:43 +02:00
AnonymousHybiandGitHub 31c40858a2 Merge pull request #741 from Shadowfire117/master
weh, reupload because im a derp
2019-08-01 17:15:30 +01:00
TheFurryFeline 7601c29d89 Timeclock Fixes
Fixes time left output as well as for when the timeclock announces the wrong position when it was an alternate title, etc.: https://github.com/VOREStation/VOREStation/pull/5434
2019-07-26 10:15:15 -04:00
Shadowfire117 bacf43ac44 quick fix for jukebox having access to casino audio! 2019-07-23 16:55:49 +02:00
Shadowfire117 a5f0b88225 Heres the big one folks, the casino!
New space map with room to add more interesting event places! ((Will be revealed when event happens ;3))
Casino ship! It has waiting lounge, medbay, security wing, engineering closet, janitor closet, emergency eva storage, bar, stripper poles and lap dance rooms, large gambling area, exchange booth, several dorms, staff only area with staff R&R, restroom and showers, cockpit and the casino managers private quarters! ((As above))
Casino shuttle! That’s right, gamblers and casino staff can be brought back and forth easily enough in a comfortable casino shuttle! ((As above above))
Casino roulette table, its fully functional with rolling and even nice sound to fill the atmosphere with that rolling ball!
Casino card table, a three parts table for a dealer to work at with up to 3 or even 5 players to sit at!
Casino slot machine, it eats chips and sometimes spits out rewards when you get three of a kind! Also got a lovely little sound effect when you win!
Casino chips, they work like similarly to thalers but has can only be used for slot machine and gambling and rewards in casino, Theres chips for values of 1, 10, 20, 50, 100, 200, 500 and 1000!
A fancy casino platinum chip that looks pretty fancy!
The wheel of fortune, its interval for roll results can be adjusted on the fly to suit how many lottery entries there are or for other events!
Stripper pole, finally people can dance and grind on a pole, interacting with the pole makes the dancer swing around and move in front or behind the pole!
Three special  bluespace deluxe machines for drinking and dining!
-	The deluxe dispenser, this bad boy can hold up to 90 cartridges and can restock anything the soft drink, hard drink and coffe dispensers can do, and even more!
-	The deluxe dining distributor, holds a big variety of food and also tools and gear for a chef, nice and compact storage!
-	The deluxe drink distributor, this one holds a lot more drinks than the standard booze o mat, and there’s not much one can’t mix with this and the deluxe dispenser!
A fancy new jukebox! This one plays music specifically for the casino unlike the normal jukebox!
A looong manual on how to play casino games, get prizes, even got info for casino staff and also ooc info!
2019-07-22 01:59:43 +02:00
TheFurryFeline 6820f7c974 Merge branch 'master' into TFF-Infinite_Frame_Fixy 2019-06-03 18:18:03 -04:00
TheFurryFeline e3e442e9b0 Infinite Frame Fixy
Ports https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855 to fix runtimes for several machinery objects.
2019-06-03 18:14:44 -04:00
RazgrizandGitHub 2d1e52c83f Merge pull request #695 from Razgriz1032/Razgriz1032-Suit-Cycler
Suit Cycler now applies suit stats
2019-05-26 23:40:12 -07:00
RazgrizandGitHub 4bcd56ec07 fix 2019-05-26 23:26:34 -07:00
RazgrizandGitHub c5c329af4f Suit Cycler now applies suit stats
Suit Cycler now applies the proper armor, descriptions, and temperature protection stats to all of the engineering and medical suits.
2019-05-26 23:15:29 -07:00
Nadyr f43c991bad -Adds a metamorphic pint glass
-Adds metamorphic pint glass to booze-o-mat
-Also fixes goldschlager to use the right icon in a metaglass (it used the vodka/gin sprite before)
2019-05-26 22:00:35 -05:00
TheFurryFeline beba47a3e1 Timeclock Usage Upgrade
Allows you to switch to off-duty mid-round and, depending on whether there's an HOP, back on duty with non-command level jobs available.
2019-05-19 16:16:35 -04:00
TheFurryFeline 9c62bb5f55 Lift Spawnpoint Fix
Fixes the spawnpoint given to the Elevator objs inside one of the three portal rooms. You'll be able to spawn in and out, the location saved to your persistency settings.
2019-05-15 15:32:47 -04:00
TheFurryFelineandGitHub 2f056d4d4f Fire Alarm Now Deconstructible 2019-05-02 22:38:59 -04:00
TheFurryFelineandGitHub ffe9abafc0 Request Console Setting Fix
Fixes inability to set what department a Request Console can be set to, from Cargo to the Bridge.
2019-05-02 22:28:50 -04:00
TheFurryFelineandGitHub 62623e674a Bob. I'm a Ghost!
Ghost-ifies all prey inside guts again. Sorry about that, y'all.
2019-05-02 01:16:15 -04:00
TheFurryFelineandGitHub 081fc95142 No More Sleeping!
Fixes Cryopods so you can change your mind while inside and eject yourself. Ported from https://github.com/VOREStation/VOREStation/pull/5078
2019-04-18 22:28:38 -04:00
Jon 738ab0d1e8 Fixes dragon's stupid warnings 2019-04-14 23:11:08 +01:00
HiziaanandGitHub ef31b683ca Merge pull request #627 from TheFurryFeline/TFF-Door_Repair_Fix_For_Drones_and_Borgs
Borgs and Drones' Delight
2019-04-12 11:23:30 -05:00
TheFurryFelineandGitHub ab8df442ad Borg/Drone Enabled to Fix Doors
Electrified Door Events no longer a pain for silicons, they can repair doors left and right now! :3
2019-04-12 11:53:24 -04:00
Nadyr 3b7630259c Introducing matcha!
-Adds matcha, matcha powder, and matcha latte reagents
-Adds recipe to microwave a steamed tea leaf to get tencha then use a knife to devein and obtain matcha
-Adds matcha latte to the coffee dispenser, also makes the new cartridge available in the coffee dispenser refill crate
-Fixes grammatical issues with tea
-Removes teamush added when steaming tea leaves
-Adds matcha ice cream
-Adds icons for new objects
2019-04-12 05:59:48 -05:00
SharkmareandGitHub 59a9fc3d38 EGG 2019-04-10 15:39:24 +02:00
SharkmareandGitHub 4c6bf16ad8 Update buttons.dm 2019-04-10 15:27:41 +02:00
SharkmareandGitHub bbd91ae26f Update buttons.dm 2019-04-10 15:19:51 +02:00
SharkmareandGitHub 516f1e9604 Update buttons.dm 2019-04-10 15:08:08 +02:00