Commit Graph

7166 Commits

Author SHA1 Message Date
Cael Aislinn a2455e66d0 Merge pull request #186 from Carn/Issue116
Resolves #116 - PDAs can only be used when in the user's contents, as op...
2013-04-01 10:10:48 -07:00
Cael Aislinn a8717b4f62 Merge pull request #190 from Carn/Issue118
Resolves issue #118 - Mob overlays will now update when a cigarette expl...
2013-04-01 10:04:17 -07:00
Cael Aislinn 91c15c13dc Merge pull request #173 from Petethegoat/runtime_fixes
Runtime fixes
2013-04-01 09:56:25 -07:00
Pete Goodfellow 842d9028d3 Merge branch 'master' of github.com:tgstation/-tg-station
Conflicts:
	code/modules/mob/new_player/new_player.dm
2013-04-01 16:29:36 +01:00
carnie 4a858b08f4 Resolves issue #118 - Mob overlays will now update when a cigarette explodes from plasma/weldingfuel after being lit. 2013-04-01 06:41:18 +01:00
carnie 6667c21548 Resolves #116 - PDAs can only be used when in the user's contents, as opposed to previous behavior where it could be in any mob's contents or on the floor. 2013-04-01 04:42:01 +01:00
Carnie 881e933072 Merge pull request #182 from Petethegoat/names
Fixes PDA and bag names.
2013-03-31 18:50:26 -07:00
Pete Goodfellow adbd33e918 Merge branch 'underwear' of git://github.com/Carn/-tg-station into carnunderwear 2013-03-31 21:30:50 +01:00
Giacomand 7f70e4ec35 Merge pull request #159 from Aranclanos/Fourth
Added adminlogs to hacked laws (tator syndicate board)
2013-03-31 06:41:40 -07:00
Pete Goodfellow c31eb95912 Fixes PDA and bag names. 2013-03-31 14:34:51 +01:00
Giacomand 1c41099223 Merge pull request #152 from Petethegoat/globalscleanup
Tiny bit of tidying up for global.dm and landmarks.dm, removing some old...
2013-03-31 04:53:02 -07:00
Pete Goodfellow b06283caa0 Fixes bags.dm. :/ 2013-03-30 18:32:44 +00: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 2f57e16541 Merge branch 'master' of github.com:tgstation/-tg-station into janicart 2013-03-30 17:34:00 +00:00
Cheridan 2dd68fc86d Janitor/Wire/Hydro Sprite Stuff.
-Adds janitor cart sprites for pete. Removes trash.dmi and merges it with janitor.dmi.
-Moves the 8 separate wire .dmis and puts them in their own folder.
-Moves plants.dmi into the flora folder.
-Adds sprites in hydroponics-related .dmis for my upcoming project. Greatly cleans up hydroponics.dmi
2013-03-29 23:33:40 -05:00
Pete Goodfellow ccfc1ea482 Fixes the description. 2013-03-30 04:31:06 +00:00
Pete Goodfellow f1d5f175c5 Fixes capitalisation of the cleaner grenade. 2013-03-30 04:18:25 +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
Pete Goodfellow dcebf2cd4a Readded the thwump sound when you harmbaton a dude. 2013-03-29 17:18:38 +00:00
Pete Goodfellow 1b6683b443 Update to use proper procs rather than setting stuttering directly 2013-03-29 17:10:42 +00:00
Pete Goodfellow d6bec54dcc Fixed the forcesay runtimes, and slightly restructured stunbaton.dm. 2013-03-28 18:18:06 +00:00
Pete Goodfellow 3496310ec3 Removes /obj/item/weapon/gift from the code, as it was completely unused.
Also removes the smallDelivery loop in /mob/proc/get_contents(). It's amazing that proc worked at all, it really does do what it's described as doing. I'm leaving it for now, as the game seems to have gotten on well enough so far, and it'll probably just increase processing for no gain if I fix it.
2013-03-28 13:02: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
Cheridan f5da96e937 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-03-27 20:36:31 -05:00
Aranclanos 00da961d14 Added adminlogs to hacked laws (tator syndicate board) 2013-03-27 21:49:32 -03:00
Cheridan c795b05d97 Minor chems update.
-Spraybottle chempuffs will now pass over tables.
-Further reorganization of chemistry reagents. Organizes toxic chems into subtypes. This cuts down on copied code and allows us to do fun things in the future, like machines that filter poisons and such.
2013-03-27 19:08:45 -05: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
Pete Goodfellow 6bd74786c0 Tiny bit of tidying up for global.dm and landmarks.dm, removing some old, oooold vars. 2013-03-27 16:37:00 +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