Commit Graph

15256 Commits

Author SHA1 Message Date
Razgriz 458c45b12e Merge pull request #782 from Razgriz1032/Razgriz1032-spider-eggs
Spider Egg nerf
2019-08-25 19:23:44 -07:00
Razgriz 675a925dc2 Spider eggcluster/small change
Spiderling spawn amount
Old:
min=1
max=3

New:
min=2
max-6
2019-08-25 19:02:00 -07:00
Sharkmare e46e9e28f8 Update buttons.dm 2019-08-22 12:55:30 +02:00
Sharkmare 9ea5ddeba7 Dare/Chaos button Restructure 2019-08-22 12:53:27 +02:00
Sharkmare e83306b8ad include casino 2019-08-19 14:28:20 +02:00
Sharkmare d9ea50b97c RIG 2019-08-19 14:25:00 +02:00
Sharkmare 5c81200266 VAR FIX 2019-08-19 14:22:13 +02:00
Sharkmare 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
kcin2001 8b61932c0b Merge branch 'master' into Booze-Borg 2019-08-16 23:02:05 -07:00
kcin2001 477e0772a9 Finished Booze borg - belly does nothing special 2019-08-16 22:49:37 -07:00
Razgriz 42b1d05077 Merge pull request #758 from Sharkmare/patch-87
Optimize Chaos button, add Dare button
2019-08-12 01:54:42 -07:00
Razgriz 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
Sharkmare 3a109f3fed Update buttons.dm 2019-08-09 13:06:17 +02:00
Sharkmare 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
Sharkmare f47d75c579 Fixing indents 2019-08-09 09:21:43 +02:00
AnonymousHybi 31c40858a2 Merge pull request #741 from Shadowfire117/master
weh, reupload because im a derp
2019-08-01 17:15:30 +01:00
Shadowfire117 091a6306f7 The big panda update! Skits has been so kind as to provide sprites for trash panda that one can randomly disturb when digging through the trash, the pAI got itself a new chassis in the form of a scrap panda, we also got alternative sprites for wah and a new waaah! 2019-08-01 11:41:40 +02: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
Razgriz 84f1bc52bc Merge pull request #701 from Darlantanis/CouchUpgrade
Couch Upgrade
2019-06-01 14:11:40 -07:00
Nadyr 592aacac6e -Adds as many colored couches as there are comfy chairs
-Reclassifies current couch as "old couch," still buildable
-Fixes the directions on the corner couch sprite to rotate like it should
2019-06-01 05:48:26 -05:00
TheFurryFeline 93c4c2b5cf Closet Access Tweak
Add an additional level of access to command secretary locker so secretaries can actually access it when needed.
2019-05-31 00:32:07 -04:00
Razgriz 6747a159e3 Merge pull request #697 from Darlantanis/ParadiseCouchPort
Basic Paradise couch port
2019-05-28 21:58:38 -07:00
Nadyr 3248675fed -Adds basic steel couches from Paradise.
-Adds icons for said couches.
-Adds recipes for couches (2 steel per couch).
2019-05-28 23:43:51 -05:00
Erik Darkpaws d43bfdec28 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into ErikTheDogEdits
# Conflicts:
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
2019-05-27 00:37:27 -07:00
Razgriz 2d1e52c83f Merge pull request #695 from Razgriz1032/Razgriz1032-Suit-Cycler
Suit Cycler now applies suit stats
2019-05-26 23:40:12 -07:00
Razgriz 4bcd56ec07 fix 2019-05-26 23:26:34 -07:00
Razgriz 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 1d630cba18 Off-Duty Jobs Frenzy
Add special IDs that have assistant access.
Force requirement for HOP to switch back on to command jobs.
Minor capitalisation fix.
2019-05-19 15:06:26 -04:00
Hiziaan 08b1e38f11 Merge pull request #677 from TheFurryFeline/TFF-Manual_Corrections
Update Manuals
2019-05-18 12:55:19 -05:00
Hiziaan 99813c1556 Merge pull request #674 from TheFurryFeline/TFF-Lift_Latejoin_Fixy
Lift Spawnpoint Fix
2019-05-18 12:40:15 -05:00
TheFurryFeline 59b17b2c30 Update Manuals
On the tin, basically changes/updates some of the books that are manuals for various things you can do in-game.
2019-05-18 13:33:08 -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
Hiziaan 84d7fed36d Merge pull request #668 from Razgriz1032/Razgriz1032-Mine-Music
New Mine Music
2019-05-06 21:54:18 -05:00
Razgriz 2c91342eec New Mine Ambience 2019-05-06 19:39:49 -07:00
SoulZeDurgon ca2acc4655 Fixes 2019-05-06 17:30:58 -04:00
SoulZeDurgon c68c8ccf0c Fixes broken areas in abandonned outposts. 2019-05-04 22:53:14 -04:00
Hiziaan 7c8ea10e80 Merge pull request #659 from TheFurryFeline/TFF-Clown_and_Mime_Access_Fix
Clown/Mime Shenanigans
2019-05-04 18:05:24 -05:00
TheFurryFeline 8c9f0b7a89 Access Additions
Give HoP Clown/Mime access due to them being part of the Civilian department.
Define how many clowns/mimes there can be, one of each.
Remove whitelist/latejoin restrictions to enable spawning in at roundstart,
2019-05-03 19:29:33 -04:00
TheFurryFeline b7bbd108f1 Show Me Your ID
Gives IDs to Clowns and Mimes so they can get through their office doors. Also adding the rooms' access to captain and synthetic IDs because CD/borg/drones have normal all access.
2019-05-03 19:19:22 -04:00
TheFurryFeline c8a03bd728 Clown and Mime Access Added 2019-05-03 19:06:07 -04:00
TheFurryFeline 2f056d4d4f Fire Alarm Now Deconstructible 2019-05-02 22:38:59 -04:00
TheFurryFeline 31d7c8fc89 Taperoll Fixes
Apparently, there were issues with them being used on tiles with directional windows. 🤷‍♀
2019-05-02 22:31:19 -04:00