Commit Graph

15290 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
TheFurryFeline 8334b1f31c Part 2
POI areas properly fixed for easy distinctions. Confirm all air alarms are placed in proper places. And attempt to make a POI remain unpowered...... (FAILED and shelving for now)
2019-10-18 07:11:44 -04:00
TheFurryFeline 5f7effbe49 Part One
Summary in main PR post of things on ToDo list
2019-10-17 20:28:35 -04:00
kcin2001 893767119e makes dirt making a toggle 2019-10-11 18:37:21 -07:00
Razgriz 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
Razgriz 3289c44896 Merge pull request #824 from TheFurryFeline/TFF-Mouse_Plushies_LIVE!_LIIIIIIIVE!!!!!
LET THE PLUSHIES LIVE
2019-10-07 04:33:49 -07:00
Razgriz 4e5a066dca Merge pull request #825 from TheFurryFeline/patch-24
Timeclock Output Fix
2019-10-07 04:20:48 -07:00
Razgriz 2ac81bc757 Merge pull request #833 from Razgriz1032/Razgriz1032-predator-crate
More animals in predator crates
2019-10-07 04:18:44 -07:00
Razgriz 6b80cb2ef2 Add files via upload 2019-10-07 04:02:39 -07:00
Razgriz 4c6d4cf8ab Adds more animals to pred crates 2019-10-07 03:43:10 -07:00
Razgriz 8549cfcc0e More animals in predator crates
+Predator crate and dangerous predator crate
-Moved chocobo to predator crate from dangerous predator crate.
-Added the following to the predator crate:
Chocobo
Alpha Chocobo
Super Metroid
Four varieties of red panda
Three varieties of pitcher plants

-Added the following to the dangerous predator crate:
Omega Metroid
Queen Metroid
Spider Queen
Phoron Spider
Carrier Spider
Dragon
Phoron Dragon
2019-10-07 03:24:59 -07:00
TheFurryFeline 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 f2bd35f46a LET THE PLUSHIES LIVE
Changes icon states for mouse plushies to NOT be resembling dead mice. :C
2019-10-03 01:11:41 -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
TheFurryFeline 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
Razgriz 0c4145f477 Merge pull request #821 from Razgriz1032/Razgriz1032-MineMusic
More Mine Music
2019-10-01 20:15:04 -07:00
Razgriz ed24c5f95c More Mine Music
Adds two new Lego Rock Raiders tracks
2019-10-01 01:12:54 -07:00
Sharkmare 17c5daa6a2 Update buttons.dm 2019-09-29 11:04:11 +02:00
Sharkmare 41eabec38c Update buttons.dm 2019-09-28 12:18:01 +02:00
Sharkmare edd423cfa6 SPECIAL BUTTON CODE CLEANUP 2019-09-28 10:56:52 +02:00
Sharkmare 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
Razgriz e2d76c1438 Merge pull request #813 from TheFurryFeline/TFF-Casino_Runtimes_Fixy
Fix Roundstart Runtimes
2019-09-24 13:33:44 -07: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
TheFurryFeline 5146886bcf Even Moar Map Fixes!
- Areas adjusted for Pool to differentiate between it and the fitness and sauna rooms, APCs added as needed.
- Atmospherics gets new areas for vermin events to, sorta, not spawn in the wrong damn places. New areas as in for the gas storage chambers. "Phoron Gas Storage", "Oxygen Gas Storage", you get the picture.
2019-09-24 10:26:41 -04:00
Razgriz 5799b4f260 Merge pull request #806 from JesusChristItsJasonBourne/Firstaids
advanced first aid
2019-09-24 00:26:17 -07:00
TheFurryFeline a0ba399e16 Indentation Fix 2019-09-22 13:13:11 -04:00
TheFurryFeline 4c5332a145 Redo to Fix Mistake With Icons
That was annoying with how that went.... Bad idea to overwrite the files with direct copy-pasta'ing from Polaris. Idea: Do it again but make a different name and copy the desired icon_state. Yay! It works!
2019-09-22 12:53:54 -04:00
JesusChristItsJasonBourne c21d59f709 analyzers
advanced first aid kits now come with analyzers on for doctors on roundstart - lose an advanced trauma kit so now there's 2 trauma and 2 burn kits
2019-09-22 13:46:41 +10:00
TheFurryFeline 1f3aa1dd27 Revert "Orange Is the New Orange!"
This reverts commit 686c3adf9b.
2019-09-21 18:35:56 -04:00
TheFurryFeline 686c3adf9b Orange Is the New Orange!
Add a new version of the orange jumpsuit and refactors the prison one to be a different obj path. Prison and Orange jumpsuits are both selectable in the loadout via Jumpcloth Selection. New .dmi updates for the whole thing as well.
2019-09-21 18:04:11 -04:00
TheFurryFeline 006f91cbfc Better Fix
Basically 1:1's from Polaris for the extra T-Ray Scanner issue. Just change the belt's contents for AtmosTechs. Easier than I thought, yay.
2019-09-13 15:34:03 -04:00
Hiziaan 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
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