7622 Commits

Author SHA1 Message Date
Razgriz 5bf8a84c5a Merge pull request #856 from TheFurryFeline/TFF-Flamethrower_Fix
BURN BABY! BURRRRRRRN!!!!!
2019-11-21 13:18:10 -07:00
TheFurryFeline 2cef569988 CHOMPStation Edit Comment
Oops.
2019-11-21 10:07:26 -05:00
TheFurryFeline ecf0c834b7 BURN BABY! BURRRRRRRRRRRRRRN!!!!
Ports https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/1487 and makes flamethrowers functional.
2019-11-14 17:53:36 -05:00
Erik aa26dbc7fc Admin Portal
Adds a portal that admins can spawn. Easily configurable, easily abusable. Probably will be used for future events!
2019-11-06 23:18:06 -08: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 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 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
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
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
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
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
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
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
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 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 31d7c8fc89 Taperoll Fixes
Apparently, there were issues with them being used on tiles with directional windows. 🤷‍♀
2019-05-02 22:31:19 -04:00
TheFurryFeline dda0a9055d Buckling Bug Fixes
Prevents unintended self-dragging to pipes and other chairs.
2019-05-02 22:13:02 -04:00
Vollybally c5619df560 Merge pull request #641 from MrMacint0sh/master
Egg
2019-04-19 19:20:28 -04:00
TheFurryFeline 52f9805971 APC Frames Deconstruction Fix
No more of getting more steel from the frame than what's actually used. Two sheets for two sheets. Not two sheets, then get five back. Ported from https://github.com/VOREStation/VOREStation/pull/5061
2019-04-18 23:03:01 -04:00
TheFurryFeline 0cbb172739 Light Shall Not Pass!
Prevents laser points from shining light through the hecking wall. Ported from https://github.com/VOREStation/VOREStation/pull/5095
2019-04-18 21:11:53 -04:00
Mack f293ef03b0 Adding Storage Core 2019-04-17 23:55:30 -04:00
Jon 4f7995cfc6 Tweaking Stools to unbuckle 2019-04-14 23:10:54 +01:00
Jon 4fa8e7bb2d Allows you to adjust the sounds of bikehorns 2019-04-14 23:10:27 +01:00
Razgriz 2149473804 Stun baton: Taking the harm out of disarm
Apparently poking someone with a stun baton on disarm intent counted as harm intent. Removing that. It's called a HARM baton, hot a DISARM baton.
2019-04-13 19:38:43 -07:00
TheFurryFeline c591f57615 Size Changing Module
Add a module to the Protolathe for borgs to get installed to shrink/grow as desired.
2019-04-08 11:18:52 -04:00
TheFurryFeline 2703c81029 Command Secretary Closet
HOP access, allows for distribution of extra headsets if needed.
2019-04-07 16:18:50 -04:00
Vollybally 62d5233fff Merge pull request #596 from TheFurryFeline/TFF-Minor_Map_Changes
Minor Map Changes
2019-04-05 21:19:49 -04:00
TheFurryFeline 381512b722 Command Secretary Box
Pens and Clipboards in a box for a new closet in HOP.
2019-04-05 18:00:12 -04:00
Sharkmare c05286677a Update suit_cooling.dm 2019-04-04 23:38:30 +02:00
Sharkmare 34cf4c30a9 Frostbite efficiency update
Removing frostbites ability to self cold nuke to make the thermal regulation more efficient
2019-04-04 23:37:14 +02:00
TheFurryFeline eeb1f36c09 YEET AWAY!
Add can_buckle to stools so people can do some funny shit with poor people sitting on the stools while they're just trying to drink. 🤣
2019-03-27 03:49:45 -04:00
Sharkmare 6c53757e95 Duckness 2019-03-20 16:45:00 +01:00
Sharkmare e26d539f5a Preparing the coming of the dark one.
Egg.

By now it should be clear Egg = Secret, dont look if you dont wanna be spoiled, dont spoil others.
2019-03-20 16:21:13 +01:00