Commit Graph

3026 Commits

Author SHA1 Message Date
Malkevin
cef6bd2786 Better Mop and Cart love
Slight tweak to the behavior of attacking the janicart with a mop.
Changed it so that it stores the mop when it is soaked (or the bucket is empty), as I'm sure most players would prefer their mop to always be fully soaked when they remove it from the cart.

Also changed the examine text from 'water' to 'liquid' as it was misleading. It can actually be filled with any reagent, even welder fuel...or acid... or blood... or dr.gibb...space lube... you get the picture.
2013-05-14 17:02:35 +01:00
Pete Goodfellow
46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry
Conflicts:
	code/game/objects/items/weapons/tools.dm
2013-05-12 15:09:21 +01:00
Cheridan
a6c3f4a78d Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-05-04 13:04:47 -05:00
Cael Aislinn
f0a51af7f4 Merge pull request #499 from Giacomand/ministation_merging1
Closet Cleanup and Bins.
2013-05-03 21:57:53 -07:00
Giacomand
35f6a979bc * Small fix for closets picking up anchored items.
* Made closets/crates pick up on their turf during initialization.
2013-05-04 05:07:36 +01:00
Aranclanos
74fb61eeee Merge pull request #463 from Ikarrus/reactive
[MAP] Reactive Armor as objective
2013-05-03 19:24:58 -07:00
Giacomand
77b0fce80f * Fixed a typo. 2013-05-04 01:10:32 +01:00
Giacomand
b4229b0b24 * Fixed an accidental commit. 2013-05-03 22:42:12 +01:00
Giacomand
343bfe90b2 This commit was made to help increase the compatibility between MiniStation and /tg/station.
* Restructured closets to be easier to add new features.
 * Added trash bins that you can hide in.
 * New sound effects for the bin, they are royalty free.
 * Personal lockers can now be (un)locked with your PDA/Wallet/Whatever.
2013-05-03 22:32:17 +01:00
Cheridan
725718dd5b -Replaces the holodeck boxing ring that no longer works with a dodgeball arena. Adds dodgeball sprites and defines.
-Fixes the crew monitoring console disappearing when damaged (meant to do this before but the change didn't go through somehow)
-Readds the space piano, removes the useless /device subtype from its path.

-Makes tables use a less hardcoded method to determine iconstate.
2013-05-02 11:52:55 -05:00
Ikarrus
a3f51ecbeb Adds the RD's reactive armor to possible steal objectives.
Reactive armor now spawns in the RD's locker.
Replaced some tables with racks in the RD's office.
2013-04-27 18:35:12 -06:00
Cheridan
6bc2d76003 SPRITE UPDATE & FIXES
-Fixes a bug with the crew monitoring computer vanishing entirely when broken.
-Fixes a bug with baton rechargers not displaying properly when the baton is fully charged.
-Adds a define for a decorative item for the RD's office. :)

-New sprites for mining lanterns, telescreens (with directionals), directionals for noticeboards, and a service bell. Ding ding!

-Deletes plasma.dmi, which was unused. The plasma tile overlays that are used are in tile_effects.dmi.
2013-04-27 00:40:00 -05:00
Malkevin
a8df5726c3 Merge branch 'master' of https://github.com/tgstation/-tg-station into capcarapace 2013-04-22 22:48:03 +01:00
Cheridan
189611e6d6 -Fixes the stuff Giacom pointed out.
-Updated some other items to use the hitsound var while I was at it.
2013-04-21 23:26:59 -05:00
Cheridan
1317ea6462 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-21 18:58:26 -05:00
Malkevin
8eea45c917 Since the captain doesn't spawn in his armor suit anymore I was finding it hard to tell him apart from the HoP at a glance, so I made a new armored vest just for him.
-Created Captain's Carapace item
-Made sprites for the new item (this is my first attempt at spriting, be gentle)
-Swapped the armor the captain spawns in and that in his locker to the new carapace item

https://dl.dropboxusercontent.com/u/95696802/Commits/tortlepowa/carapace.png

Additional minor edits:
-Added flashlight and t-ray to Hazard's vests equipables
-Added Pepperspray to detective coat's equipables (amazing no one noticed this before... heh)
-Copied Detective Coat's equipables over to the Detective's Vest
2013-04-21 05:28:46 +01:00
Pete Goodfellow
0a58830354 Adds the deconstructed vault airlock. Rearranges the icon_states in vault.dmi.
Removes a duplicate sandstone door assembly.
2013-04-17 19:45:36 +01:00
Cheridan
8f02d5fee1 Commitin' the stuff that didn't merge 2013-04-16 23:13:35 -05:00
Cheridan
6731fe8b83 Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2013-04-16 23:07:35 -05:00
Cheridan
c429e5883e MAKESHIFT WEAPONS UPDATE
-Removes stungloves and all related code.
-Makeshift stun batons can be made in their stead, along with spears. Spears can be thrown or used one or two-handed.
-Major stun baton revamp. They now accept batteries, which can be removed and replaced.
-Fixes the bug where you could use TK to make a dualsaber from a single saber.
2013-04-16 22:59:01 -05:00
Pete Goodfellow
e4bce0bb14 Replaced most reagent initialisations with the helper proc create_reagents(). 2013-04-15 15:40:33 +01:00
Ikarrus
4d0c134491 Added clipboards to Detective and Warden lockers. 2013-04-14 16:37:23 -06:00
Tastyfish
e4b2968e4f Cleaned up redundant piano/violin sound files and made playnote() code not be a giant unmanageable switch 2013-04-04 06:55:38 -04:00
Cael Aislinn
d1db9d4abf Merge pull request #177 from Petethegoat/janicart
Replaces the janicart with the janitorial cart.
2013-04-01 10:21:46 -07:00
Pete Goodfellow
66b2caeeb8 Updating to fit with Cheri's sprite pull.
Fixes not being able to store the mop when the cart and mop are dry.
2013-03-30 17:50:25 +00:00
Pete Goodfellow
ccfc1ea482 Fixes the description. 2013-03-30 04:31:06 +00:00
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
carnie
5ca166cae0 Refactored underwear to use datum/sprite_accessory/underwear similar to hair and facial_hair.
People may select any underwear (regardless of gender) at a dresser, but not in preferences.
random_underwear(gender) will return a random pair of underwear suitable for your gender.
Removed an unused variable in sprite_accessory

The new_player preferences screen now randomizes character slots for which there is no data (so no more bald, fat, white guys in diapers greeting new players)
datum/preferences character settings are randomised at New().
replaced /datum/preferences/proc/randomize_appearance_for(human/H) with /datum/preferences/proc/random_character(), it does the same stuff without the copying to a mob. Basically, now when you want to make a random character you just do var/datum/preferences/A = new(); A.copy_to(human_mob), randomisation of appearance and name will already be done. Easy.

Reworked the savefile updating/versioning code to make it easier to work with. I've used it to update underwear preferences to the new system as an example.

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-03-28 11:11:40 +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
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
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
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
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
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
Pete Goodfellow
b02c459505 Adding google code commits r5836 to r5849. RIP in peace google code. 2013-03-11 04:26:54 +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
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
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
d_h2005@yahoo.com
c3148b76d0 -Moves the biogen and sextractor code into the hydroponics module folder, moves the optable code into /structures.
-Committing SuperSayu's patch for slimey grenades.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5770 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-24 00:23:31 +00:00
petethegoat@gmail.com
f77a71fc04 This should fix the following runtimes:
The following runtime has occured 18248 time(s).
runtime error: Cannot execute null.IsIndexCut().
proc name: isWireCut (/obj/item/device/radio/proc/isWireCut)
  source file: radio.dm,185
  usr: Azerthene Severn (/mob/living/carbon/human)
  src: the security radio headset (/obj/item/device/radio/headset/headset_sec/department/med)

The following runtime has occured 165 time(s).
runtime error: bad index
proc name: recalculateChannels (/obj/item/device/radio/headset/proc/recalculateChannels)
  source file: headset.dm,261
  usr: Burningface (/mob/new_player)
  src: the security radio headset (/obj/item/device/radio/headset/headset_sec/department/engi)

It also makes the mirror automatically shave women when used.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5760 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-22 02:06:02 +00:00