Commit Graph

161 Commits

Author SHA1 Message Date
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
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
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
petethegoat@gmail.com
7c9eff11cb Fixed and improved the get_accessible_location() proc.
Fixed some (wrong) magic numbers in detective_work.dm.
Updated body_parts_covered on all suits. 

Changed defines:
UPPER_TORSO > CHEST
LOWER_TORSO > GROIN
THERMAL_PROTECTION_UPPER_TORSO > THERMAL_PROTECTION_CHEST
THERMAL_PROTECTION_LOWER_TORSO > THERMAL_PROTECTION_GROIN

Changed paths:
/obj/item/clothing/suit/armor/det_suit > /obj/item/clothing/suit/armor/vest/det_suit


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5751 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-21 00:53:45 +00:00
petethegoat@gmail.com
39c22b7aa3 Updated hub.dm to be slightly more descriptive.
Fixes bedsheet bins not updating their icon.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5726 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-17 21:12:16 +00:00
petethegoat@gmail.com
58c7f79398 Moved
var/obj/item/weapon/back
var/obj/item/clothing/mask/wear_mask
var/obj/item/weapon/tank/internal

from /mob to /mob/living/carbon.

/mob/proc/abiotic() no longer does any extra checks even if full_body == 1.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5722 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-17 18:53:09 +00:00
johnsonmt88@gmail.com
0bfd3feef6 Fixed windoors becoming a fountain of infinite airlock electronics, added a check to see if it had electronics in it. Fixes issue 1273.
Windoors now automatically close after being constructed like regular airlocks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5718 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-17 00:09:11 +00:00
giacomand@gmail.com
cf886f84aa - Added a death check to voice manipulating code. Fixes Issue 1244.
- Made a proc for grabbing which updates the grab status, as it is usually done in the grab's process, then made tables update the grab and check if the grab still exists. Fixes Issue 1285.
 - Made the blind check remove the blind screen if they're not blind but the layer is set to a non-zero layer. Fixes Issue 1286.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5704 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-14 11:31:29 +00:00
petethegoat@gmail.com
75a7d34ec9 Committing datum based surgery proper. There's a brief explanation in surgery.dm, if you want to know how it works.
Basically, surgeries are now initiated by bedsheets or surgical drapes, and consist of separate steps.
Appendicitis is sort of hacky, but it should work for now. I'll update it when I add processing organs.

Added getbrain() and getappendix() procs, which can be used instead of checking the old (now missing) x_op_stage variables.

Added a surgical apron, using old sprites by matty.

Updated the map:
Removed the note with spell descriptions from the wizard's den for Kor.
Updated the operating room.
Updated xenobio to have appropriate tools for slime surgery.

Path changes:
/obj/item/brain > /obj/item/organ/brain
/obj/item/weapon/reagent_containers/food/snacks/appendix > /obj/item/organ/appendix
/obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed > /obj/item/organ/appendix


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5703 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-14 01:20:58 +00:00
Kortgstation@gmail.com
c66a06d177 Added 3 more slime types so the evolution tree would be symmetrical again.
Added a bullet act to resin doors/nerfed their health.

Removed larva/drone from the possible xeno transformations with staff of change so using it doesn't always derail into a xeno round/the wizard getting facehugged.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5638 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-01 10:16:54 +00:00
ericgfwong@hotmail.com
4d1caf73f9 Added some extra injections syringes to the execution locker since the others were removed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5627 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-30 03:30:15 +00:00
d_h2005@yahoo.com
2bcc351de4 -Moves the seed-making code in the extractor to its own proc. This is used in the new portable seed extraction bags, which can be found in the hydroponics lockers.
-Makes grass a normal grown object, tiles are made via attackby. Removes the specialized code needed to handle harvesting floortiles.
-Adjusts seed sprites in the .dmi to be consistent, and adds code to randomize their position on the map.
-Adds biotech level 1 to wood tiles to match grass tiles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5622 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-28 04:22:41 +00:00
johnsonmt88@gmail.com
1cbb702418 Added a silicon check to secure lockers. Cyborgs and such should no longer be able to dump their items in lockers. Fixes issue 1260.
Added a missing 's' in the name of an artificer spell. Fixes issue 1256.

Moved construct spells out of wizard.dm and into construct_spells.dm because I do -not- like wasting so much time trying to find something because someone was too lazy to keep their stuff organized.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5605 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-24 00:36:07 +00:00
ericgfwong@hotmail.com
4d9af5c0a4 Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 00:11:48 +00:00
Kortgstation@gmail.com
b0077b3498 Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.
They also added extra checks to

-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)

Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 10:45:20 +00:00
giacomand@gmail.com
95392cae87 - Fixed retaliating simple animals acting weird and added some minor improvements. They should act better to mechs.
- Decreased the amount of possible chickens you can get from the crate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5577 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 19:54:00 +00:00
Kortgstation@gmail.com
4f95636530 Slimes can no longer be buckled to things, they're too squishy (people were abusing the fact that slime AI can't unbuckle)
Golems get head protection from their suit now and have their head slot clear so you can tell em apart with hats.

Fixed a typo related to slime surgery that I assume has been around since metroids were added how did nobody notice this thanks Failcakes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5563 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 00:59:18 +00:00
baloh.matevz@gmail.com
5bb06b184c - Added a killswitch to the master controller for air processing and pipe processing, accessible through two toggle-verbs in debug verbs.
- Added a verb that breaks all airgroups into individually processing tiles and a verb that forces a group-rejoin attempt on all airgroups. Once the verb to break all air groups is used, they will not attempt to recreate until the recreate verb is used. In other words, this is for debugging, not goofing around. Verbs available in debug verbs.
- Some atmos code standardization
- Decreased the pressure resistance of most items by a factor of 10, meaning pressure will finally actually move items around!

I also attempted to speed up air movement, but it caused runtimes and everything moved in checkered patterns and I got scared so I didn't include it in this commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5554 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 07:12:32 +00:00