Commit Graph

1590 Commits

Author SHA1 Message Date
Pete Goodfellow
9425c0186c Updates the mop and mop bucket code. Should work exactly the same. 2013-03-30 04:17:55 +00:00
Pete Goodfellow
561821269d Committing the janitorial cart! Sprites not included. 2013-03-30 04:16:33 +00:00
Pete Goodfellow
c2cc2e1a41 Removing the janicart from the map, replacing it with the new janitorial cart.
Updates the janitor's starting equipment and his locker.

Updates the contents of the safe in the vault.
2013-03-30 04:15:46 +00:00
Pete Goodfellow
b02deca64d Code for the janitorial cart. Updates some parts of the old janicart too. 2013-03-28 02:05:46 +00:00
Pete Goodfellow
565cbbc197 Updated dresser.dm icon to the full path. Adds dresser.dm to the dme. 2013-03-27 17:03:51 +00:00
Cheridan
293b2cfdfc -ADDS THE DRESSER.DM. FUUUUUCK. 2013-03-27 11:24:23 -05:00
Giacomand
ef9f300a94 Merge pull request #69 from Tastyfish/master
Violin & Piano UI Update
2013-03-26 02:48:09 -07:00
Pete Goodfellow
d53fdcaede Set the twohanded.dm offhand item to abstract = 1. 2013-03-25 17:15:14 +00:00
Pete Goodfellow
2b3c769662 Makes /obj/effect/decal/cleanable/dirt mouse_opacity 0, as it covers the whole tile and prevents people from crowbarring it up.
It can still be cleaned by mopping the tile.
2013-03-24 16:01:49 +00:00
Cael Aislinn
4c240f718e Merge pull request #76 from Cheridan/master
Glowshroom Reworking
2013-03-22 19:04:04 -07:00
Cael Aislinn
cff236a57d Merge pull request #67 from Uristqwerty/master
More tube stuff
2013-03-22 07:46:26 -07:00
Aranclanos
ae0c91e8a2 Removed the stun of the electric chair. It was a 10 minute stun. It's open for discussion. 2013-03-20 10:25:38 -03:00
Aranclanos
63de9f1019 Fixes a runtime regarding the construction of standard airlocks. Changed two if checks [if (var == "")] for [if(!var)] 2013-03-20 08:20:39 -03:00
Tastyfish
806d784b16 Moved backend and UI functionality into the datum/song class and made in generalizable for special-case functionalities for player checks, etc 2013-03-20 04:52:17 -04:00
Tastyfish
02b3b35b72 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-03-20 03:25:46 -04:00
Carnie
986b06bb10 Merge pull request #59 from Nodrak/master
Airlock Painters
2013-03-19 21:37:33 -07:00
Tastyfish
e6efe1a82d Updated the violin to use the new UI style and datum, and fixed a bunch of dialog updating bugs within. Fixed a couple buttons to work before song created, that should, such as import song. Changing tempo works more naturally now. 2013-03-18 21:29:08 -04:00
Uristqwerty
2be4321672 Quick cleanup/fix 2013-03-17 21:13:19 -04:00
Uristqwerty
eb32b0e45c Automatic tube state, tries to connect two tubes.
Less precise, but faster to lay out when mapping.
2013-03-17 20:59:36 -04:00
Cheridan
9c8505bd44 -Recodes glowshrooms.
Fixes the bug with effects/glowshroom not glowing when placed.
They don't spread infinitely: The odds of a shroom spreading decreases with each generation. Because they're sane now and not virally-spreading fungal horrors, they've been changed to spread on normal station floors and not just the asteroid.
The spreading glowshrooms acquire the parent's stats, with some mutations.
The delay variable is now based off of production, and goes DOWN with better stats instead of GOING UP.

-Removes unnecessary (copy-pasted) code bits in walking mushroom/killer tomato code in grown.dm
2013-03-17 19:24:51 -05:00
carnie
c983e287a3 Modifications/RuntimeFixes for Majorseph's cigarette lighting stuff:
>type mismatches in cigarette/attack()
>mob overlays now update correctly when lighting somebody else's cigarette/cigar/pipe/etc
>removed some copypasta procs (pipe/light(), pipe/attackby() and cigar/attackby())

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-03-18 00:13:44 +00:00
Uristqwerty
6757ede6e0 Ladder tube for N-S and E-W. Can be walked over.
+ supporting code for the ladder tubes
 + pods automatically start moving in all tube types, rather than just stations
2013-03-17 14:18:09 -04:00
carnie
45b708c819 Merge branch 'master' of git://github.com/majorsephiroth/-tg-station into CigaretteLighting 2013-03-17 17:39:32 +00:00
Nodrak
8b906530fe Changed the airlock_painter stuff back to how Ricotez had them coded. Instead of clicking on the painter and setting the airlock type that way, you do it when you click on the door with the painter.
Cheridan fixed the inhand sprites being off, thanks Cheridan!
2013-03-16 13:05:50 -04:00
Giacomand
8bb0ac8a1d Merge pull request #48 from aranclanos/master
EMP effects get garbage collected
2013-03-14 01:45:52 -07:00
majorsephiroth
d3f7959350 Changelog updated. Added the ability to help people light cigs with cigs/cigars.
Signed-off-by: majorsephiroth <majorsephiroth@hotmail.com>
2013-03-14 10:44:22 +11:00
majorsephiroth
33905ce24a Expanded what can light things. Cigars and pipes can now be lit by standard sources. Standard sources are: Lighter, Zippo, Igniter, weldingtool, energy sword, and candles. 2013-03-13 16:17:02 +11:00
Aranclanos
e62295e98e Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-03-13 00:08:20 -03:00
Nodrak
beedf1bfb0 Airlock painters! Commit for Ricotez
- Adds a new device that will paint airlock assemblies. This works on both solid and glass airlock.
- Click on the sprite of the painter to set it.
- Uses toner as 'ammo'
http://forums.nanotrasen.com/viewtopic.php?f=16&t=12053

Featuring Teh_Wolf's paint sprayer sprite complete with inhands!
2013-03-12 19:36:15 -04:00
carnie
7c01c25232 Merge branch 'master' of git://github.com/Cheridan/-tg-station 2013-03-11 17:51:19 +00:00
Cheridan
971cf6e628 Cable coils and cable cuffs now use the inhand sprites. Only red and blue, for now. 2013-03-11 11:53:27 -05:00
Pete Goodfellow
14b1777359 Rewrote how handcuffs work. Fixes gcode issue 1376.
Includes standardization and text styling.
2013-03-11 15:54:00 +00:00
Pete Goodfellow
b02c459505 Adding google code commits r5836 to r5849. RIP in peace google code. 2013-03-11 04:26:54 +00:00
d_h2005@yahoo.com
a0045477be -Committing a slightly changed version of Startoad's bureaucracy crate patch.
-Dualsabers now come in the alternate colors, sprites courtesy of mjrseph.
-Adds the Vealrender, a harmless and goofy version of the veilrender, courtesy of supersayu. You can possibly find it in mining asteroid surprise rooms.
-*flap and *aflap are gender sensitive now, whoa!


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5834 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-09 06:00:40 +00:00
petethegoat@gmail.com
1af9267159 Fixed the plasmafire theme active left hand sprite.
Fixed the baton text styling.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5827 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 22:13:54 +00:00
petethegoat@gmail.com
8ff7285645 Updates HUD stuff!
The main goal was to remove all the pointless shit in the UI style dmis, but this commit actually goes a bit deeper than that.

Formally renames the "hurt" intent to "harm", in line with everything else in the world.

Removes the old screen1_... .dmis. They've been replaced with screen_... .dmis. They function much the same.
screen_gen.dmi is used for things which apply to multiple UI styles, such as storage slot sprites, or the intent selector. (These can still be overridden in HUD code, though.)

Item action buttons have been changed to use a template from the UI style, and the icon_state of the item.
var/icon_action_button has been removed- varvar/action_button_name must be used instead to add action buttons for items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5826 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 21:32:00 +00:00
elly1989@rocketmail.com
0fbd92f5c3 Shuffled all the #defines in global.dm and setup.dm
They have been separated into low-level stuff that you wouldn't really want to ever edit (like the definition of PI) which are in __DEFINES.dm
The others, which hosts could possibly want to modify for their server, are located in _compile_options.dm

I've tried to group it together in some sort of logical way so it's easier to find what you need. Feel free to move whatever.

Main reason for the change is so we can add some more compile options into the game to make it more configurable.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5825 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 19:02:19 +00:00
petethegoat@gmail.com
5566c4dbec Commented and improved code/modules/mob/screen.dm.
Removed targeting hands and feet. Those areas now go to arms and legs instead.
Updated the zone_sel.dmi icon_states for this.

MouseDown() is now completely unused. From the Byond ref:
"Don't define this unless you need it, because it generates extra communication that is otherwise avoided."

Fixes issue 1378. Carbon jetpacks are used as internals
Back tanks are now checked last when searching for internals.

Moved var/foldable from /obj/item/weapon/storage to ..storage/box.
Changed verb/quick_equip() to be on humans instead of all mobs (it was only usable by humans anyway.)
Updated locker resist code a little bit, mainly removing a spawn(0).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5819 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-07 19:35:33 +00:00
petethegoat@gmail.com
bdf8abff40 Overhauled grabs. They should pretty much do the same thing as before, although they should be a fair bit more effective.
Updated some text styles and such along the way.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5818 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-07 01:30:29 +00:00
petethegoat@gmail.com
786242f9b2 Big text styling overhaul. Mostly affects reagent related stuff.
Adds a new 'userdanger' class, which is bold and red. 'danger' is now just red. Adjusts all dangerous messages I could think of to use the appropriate class.

Trash items can now be washed away in sinks.

Removes the robodropper, on account of it being awful. Borgs get a normal dropper instead.

Changes the probability of blood spatter from attacking someone from 33 to item.force * 2

Path changes:
/obj/item/weapon/reagent_containers/ld50_syringe > /obj/item/weapon/reagent_containers/syringe/lethal
/obj/item/weapon/reagent_containers/ld50_syringe/choral > /obj/item/weapon/reagent_containers/syringe/lethal/choral
possibly some others? i think this is it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5815 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-06 17:44:49 +00:00
johnsonmt88@gmail.com
c21c2b0ab2 Airlock settings for the RCD.
Committing for Ricotez:
http://forums.nanotrasen.com/viewtopic.php?f=16&t=12054

This adds a verb to the RCD which allows the player to select which type of airlock it spits out. 

I've set the hand-held RCD is set to create any colour airlock while the borg's RCD can only spawn the default glass and solid airlock. The reason for this is that the borg has no way to change the ID requirements of the door and the borg's RCD is already vastly superior to the handheld version because of how it draws power.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5812 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-06 02:34:03 +00:00
aranclanos@hotmail.com
3a2673a284 Changes for all the different update icons procs of humans and monkeys, they now update their own sprite and hud icon (if it's a proc of a slot item) without having to call for update_icons().
A lot of different calls for update_inv_[slot] now won't call for update_icons.dm(). Such as dropping, throwing, picking up objects, moving objects around your gear, using your active hand, firing guns, stripping, etc.
All the different calls for UpdateDamageIcon() now they won't call for update_icons()
The different sprites of humans/monkeys will now have their own layer, humans starting with MUTANTRACE_LAYER in layer -1 to R_HAND_LAYER in layer -20, so the sprites don't get messy overlapping eachother if update_icons() is not called. To help this change, all layers numbers were changed, R_HAND_LAYER used to be 1, now it's 20. (This can be changed back if it ends up being confusing or ugly to read)

TL;RL I removed 90% of the calls for update_icons() modifying the different update procs of update_icons.dm of monkeys/humans. The goal is to reduce lag.

JUST IN CASE, lying down will call for update_icons(), so players have an easy way to update their icons if something goes horribly wrong. Which won't. I hope.


Fixes issue 842. Handcuffs sprites appearing on the player's UI if this one was handcuffed. Because I liked this we'll call it feature and add some awesome sprites made by Cheridan, you'll now have a new sprite on your UI telling you "you're handcuffed buddy!". (Also he named the sprites so don't blame me)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5809 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-04 05:01:07 +00:00
Kortgstation@gmail.com
85f567cae2 Made cult blades/double barrel shotguns fit on exosuit slots again.
Wizard staffs, SAW, combat shotgun still don't

Added the Mjollnir and Singularity Hammer. Just silly melee weapons I coded/sprited for fun. Both are using the Mjollnir's sprites currently though I didn't have it in me to make a billion more inhands for the Singularity Hammer.

Mjollnir shocks the target and hurls them away/spews lightning around.

Singularity Hammer pulls everything nearby in towards the target.

Don't really have plans to balance them or make them obtainable in game but I thought as long as I'd coded them some admin or another may enjoy trading them to antags/giving them to the chaplain etc.

Lowered fireballs cooldown and decreased its explosion size (so wizards can use it without killing themselves by causing hull breaches)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5805 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-03 01:46:25 +00:00
giacomand@gmail.com
edbae4d9d5 - More runtime fixes.
- Committed carn's fix to events happening every 5 minutes, on the dot.
 - Changed some more turf which play sound so they do not play to everyone in the area.
 - Made the join screen a little bigger for the "view player polls" option.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5801 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-02 16:51:57 +00:00
giacomand@gmail.com
a3b74c9d2b - Multiple runtime fixes.
- Moved some fingerprint procs to detective_work.dm.
 - Removed some unnecessary del() usage in the detective code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5800 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-02 01:19:02 +00:00
johnsonmt88@gmail.com
0ea1c9c050 The nuke disk is no longer able to be scanned, and therefore duplicated, by the chameleon projector. Fixes issue 1265.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5799 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-02 01:00:25 +00:00
giacomand@gmail.com
763b07d8d4 - Cleaned up false walls a bit and fixed some issues with using a welding tool with it. Fixes Issue 1288.
- Greatly decreased the goat attack damage. Fixes Issue 1310.
 - Changed how the suffixes are assigned for mulebots. Fixes Issue 1204.
 - Added some checks for occupants in sleepers/cryo/cloner pod, stops an exploit of being able to have a friend teleport you to the sleeper when you're in danger.
 - Re-added advance proc call for debug flag.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5796 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-28 23:22:37 +00:00
d_h2005@yahoo.com
ab336248e0 Adds a new DARK LORD syndicate bundle! Comes with two energy swords, a TK injector, an agent card to make your own cool title, and some stylish robes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5795 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-27 20:14:20 +00:00
giacomand@gmail.com
46dc7d6084 Committing Faerdan's UI overhaul. Includes a UI browser class to easily manage and standardize user interfaces. This first release does not convert all the user interfaces in the game but only most of them. You can find samples of these user interfaces here: http://imgur.com/a/5dr6E
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5794 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-27 20:02:42 +00:00
petethegoat@gmail.com
99d892214f Fix for the safe being very occasionally uncrackable (thanks, Sabbat).
Added the hemostat to the autolathe list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5786 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-26 01:14:26 +00:00