Commit Graph

72 Commits

Author SHA1 Message Date
Fox McCloud
f9c0fd2d25 fixes 2019-08-11 15:33:00 -04:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
Aurorablade
654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Aurorablade
38cf6c27c0 Oil tank, OIL TANK 2018-07-12 19:05:53 -04:00
Fox McCloud
7c8299d443 mint machine 2018-04-23 15:44:29 -04:00
Fox-McCloud
968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Kyep
6e1a13ee51 Adds Kluys' onhead/inhand sprites 2017-07-16 17:37:46 -07:00
Kyep
dbfb6a34f5 Placeholders for emagged drones inhand/onhead 2017-07-14 18:53:25 -07:00
FlattestGuitar
8978f1e530 Fluffpocalypse 2017-04-15 22:05:15 +02:00
uraniummeltdown
cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
Markolie
3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Markolie
7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Fox-McCloud
846ce475b2 Refactors Reagent Tanks--Adds High Capacity Water Tank 2017-02-05 13:58:24 -05:00
Mieszko Jędrzejczak
333522ede3 upgrades confetti sprite 2016-03-23 20:46:41 +01:00
Mieszko Jędrzejczak
135687fe7e Adds party grenades 2016-03-23 12:11:39 +01:00
taukausanake
7dbc03555a Held mice sprite fix
FoS made notice that dead mice don't have a sprite when held. An oversight on my part but I fixed it. Shouldn't cause anymore problems
2016-03-15 23:37:21 -05:00
taukausanake
a0d4b76143 This was easier than I though...
but took longer than it should have for me to figure it out.
You can now pick up mice. Added basically the same things diona use for this feature.
2016-03-09 17:51:49 -06:00
Crazylemon64
eba74c1392 Gives chemistry breathing room - moves welding tank to a wall-mount version 2016-02-05 03:20:57 -08:00
Markolie
d8f98d6082 Add dmisort.sh script, and sorts all icons in .dmi files 2015-09-17 01:08:58 +02:00
Aurorablade
6478231a3d New Pai Frames thanks to DestroOmega 2015-07-12 09:05:43 -04:00
Aurorablade
9dcfbe797d Final Push 2015-07-02 15:29:40 -04:00
Aurorablade
5e84ab8fcc Progress Update 2015-06-24 16:02:27 -04:00
Aurorablade
9a0f518ebc Boop 2015-06-21 15:44:43 -04:00
ZomgPonies
fa5e97deb5 Missing dmis, final fixes 2015-05-25 20:35:35 -04:00
Tigercat2000
e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00
Fox-McCloud
4025495782 Merge remote-tracking branch 'upstream/master' into sofa 2015-04-26 15:10:09 -04:00
Fox-McCloud
55ba0ab60e Better Sofa 2015-04-26 03:43:56 -04:00
Tigercat2000
f76284b7af Add afterbuckle proc to beds, refactor comfychairs
This commit ports Baystation12/Baystation12#8527, as well as their
afterbuckle system. After a mob is buckled/unbuckled, afterbuckle will be
called on the object, which does nothing by default.

Comfy Chairs have been refactored to use a grayscale sprite, and also to
use overlays for the arms. This means that new colors are just a RGB
definition.
2015-04-25 09:36:06 -07:00
Cheridan
d012d77a7d Spirit Boards!
Conflicts:
	icons/obj/objects.dmi
	tgstation.dme
2015-03-26 20:00:44 +01:00
Markolie
876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Hubblenaut
2e644b845a Adds Wheelchairs with basic driving functionality
Conflicts:
	baystation12.dme
	icons/obj/objects.dmi
2014-06-03 18:46:21 -04:00
ZomgPonies
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -04:00
ZomgPonies
838d746d6e Added an NT flag as decoration and added it to a bunch of places. ALL GLORY TO NANOTRASEN! 2014-05-19 04:36:59 -04:00
Zuhayr
2e545095f7 Readds drone held icon that got lost somewhere in merges.
Conflicts:
	icons/obj/objects.dmi
2014-05-12 03:05:41 -04:00
ZomgPonies
ba9c675ba2 You can now carry diona nymphs around 2014-01-03 22:13:45 -05:00
ZomgPonies
7bbf936f45 Added space cleaner refiller 2014-01-03 14:09:30 -05:00
ZomgPonies
840a66a768 Scoreboards and slot machines 2013-11-17 04:19:20 -05:00
ZomgPonies
bd48e4c80b Added Chinese Restaurant and barber shop updates, plus some bugfixes 2013-11-02 18:23:07 -04:00
ZomgPonies
2df877bf82 Xenoarch update 2013-10-29 11:56:04 -04:00
ZomgPonies
764f8030a0 New beakers, can wear bed sheets as capes 2013-10-18 04:06:10 -04:00
ZomgPonies
2907deae87 New barber shop. Can now shave corgis. 2013-10-17 16:18:35 -04:00
Vetinari
3c0a424bb3 Medbay Remap post-ERT
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
2013-06-12 23:27:36 +10:00
giacomand@gmail.com
05ea5c67bf -Added a virus food dispenser for the Virologist. You'll find it in Virology.
-Added a sprite for the food dispenser (WARNING: it's a re-colouring of the pepperspray dispenser)
-Changed the reset button's position so it's on the bottom, this way people won't accidentally click it.
-Slightly increased the height of the job selection window.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5278 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-07 20:23:28 +00:00
petethegoat@gmail.com
8328a9c78e Added Dreyfus' ash and fire sprites, for possible future fire code.
Thanks Mloc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5091 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 20:20:39 +00:00
baloh.matevz
49f3db9954 - F12 now properly hides the action buttons
- Changed the 'black overlay' you get when paralyzed, blind or in critical condition to include a small circle around you. It still 'blinks' once every 25 seconds or so.
- Added a flag BLOCK_GAS_SMOKE_EFFECT, which can be applied to masks, glasses and hats, which prevent gas smoke, which contains reagents, from having an effect on you. Currently only present for gas masks.
- Dramatically lowered the amount of damage you get per breath while in critical condition. Critical condition now lasts for about 5 minutes if nothing is causing you any additional harm. This in combination with the new black image overlay is an attempt at making doctors more willing to help. For one thing they'll have more time to get to you, for another you will get to see if they murder you before sending you to genetics.
- Added Cheridan's wooden chairs to code
- Added a action_button_name to all items, which defaults to null and contains the text which appears on the action button. If an action button exists, but this variable is not set, the text will default to 'Use [name]', name being the name of the item tied to the button.
- Fixed the problem which resulted in certain glasses types making you keep night vision abilities even after you took them off. 

(Screenshot of black overlay: http://www.kamletos.si/blackimage4.png)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4280 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-02 08:25:34 +00:00
d_h2005@yahoo.com
eb197ceb4a New sprites for Nodrak's shield projectors. Hooray for fixing up things that have been in the code forever.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4036 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-11 17:05:28 +00:00
baloh.matevz
c61ddfd74f - Yet another Bay 12 port. This one adds their comfy and office chairs. :)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3614 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 23:17:03 +00:00
elly1989@rocketmail.com
04f0a79866 Rewrote blackholes (gravitational anomalies) and wormholes to try and optimise them a little. If you have any concerns about how I've done so just give me a shout and I'll either rework them or revert my changes back. Wormholes especially seem a bit faster on my laptop. Smoke has temporarily been removed from the blackhole event until I get time to investigate why the hell effect_systems are using so much memory ( spark effects were using 40% of my processor a second ago D: ). To compensate this I made them a new sprite.
Commented out the authentication system. It was the remnants of the old goon authentication stuff (or maybe even older) and wasn't actually used in our code at all (at least not in any useful way, it was merely called and short-circuited to 1, so all those if(authenticated) were totally pointless. This has removed 3 unused variables from every client, a bunch of unused variables from the config and two empty text files!

Committed (as a config option) a feature requested by Apoc station. It causes a 'reply to' window to popup when an admin PMs a non-admin player. It's meant to grab their attention so they can't say "I didn't see your PM". It defaults to off. To turn it on just uncomment the #POPUP_ADMIN_PM line in config/config.txt

Fixed a derp in isday where it was fetching the month instead of the day.

Removed medal references from Gib()

Removed the medal_hub global variables because they aren't used in any way shape or form.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3444 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-12 21:54:51 +00:00
petethegoat@gmail.com
f36295e16e Chair overhaul!
Shouldn't be any noticable difference ingame, but the chair path has changed from
/obj/structure/stool/chair
to
/obj/structure/stool/bed/chair
Electric chair path has also been changed as per the above.

New electric chair sprites! They ~won't~ make you want to cut out your eyes!


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3148 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-18 20:25:55 +00:00