Commit Graph

7604 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
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
Sharkmare 6c9ead5306 Update clown_items.dm 2019-03-18 02:29:07 +01:00
Sharkmare 82454c1b07 Fixing Advanced soap 2019-03-18 02:14:03 +01:00
Nadyr 1d4e4bfe31 Fixes the hacking manual to redirect to our wiki properly. 2019-03-15 23:05:59 -05:00
Vollybally 69c4c5aa17 Merge pull request #527 from TheFurryFeline/TFF-Prybars_in_Emergency_Boxes
Prybars in Emergency Boxes
2019-03-13 16:36:38 -04:00
TheFurryFeline 7d1929f812 Here are your damned commas, Travis 2019-03-13 16:26:17 -04:00
TheFurryFeline d2686b11f0 Travis, don't be a wuss. No indentations here.
Force Travis to restart.
2019-03-13 15:27:31 -04:00
TheFurryFeline eab6bc4a2f Dumb Commas
Fixes a comma being in the wrong place.
2019-03-13 14:16:49 -04:00
TheFurryFeline d33629b097 Add Prybars
Prybars can only be used on unpowered airlocks and emergency shutters if needed. Ported from VOREStation.
2019-03-13 13:59:46 -04:00
TheFurryFeline aa68936574 Add Prybars
Include Prybars to Survival Boxes. Don't throw these away. You might need it if there's power issues.
2019-03-13 13:57:18 -04:00
TheFurryFeline 192f248284 Fills Emergency Tanks to Max
Ports Polaris' edit of giving Voxs and dust-huffer their emergency tanks at full capacity rather than suffocate too early.
2019-03-12 18:54:34 -04:00
Nadyr d44b1dadf0 Fixed five errors:
-Three uses of 'AddUses' proc, ours is defined as 'add_uses'
-Removed two uses of 'status_string' proc. We don't have that proc and probably not important as it's for display messages.
2019-03-11 02:08:08 -05:00
Nadyr a204111483 First attempt to port features from Yogstation's lightreplacer.
-Feature to eat broken lights and make a new light every 4 light shards
-Ability to use box of lights on the replacer to fill it (currently must use the replacer on the box)
2019-03-11 01:54:55 -05:00
Sharkmare 878a3d7b74 Update clown_items.dm 2019-03-07 13:56:07 +01:00
Sharkmare 9119a86f0f Update suit_cooling.dm 2019-03-06 11:13:35 +01:00
Sharkmare 8d969e26a1 Update suit_cooling.dm 2019-03-06 10:41:43 +01:00
Sharkmare 98dc5056ea Adding EMAG to the cooling unit. 2019-03-06 10:40:47 +01:00
Sharkmare 30a3569509 Fixing Frostbite jelly atmos
accidentally made them suicide heat while cooling the area
2019-03-05 20:43:47 +01:00
Vollybally e544e4187c Merge pull request #475 from Sharkmare/patch-11
Frostbite jelly
2019-03-04 23:14:03 -05:00