Commit Graph

34 Commits

Author SHA1 Message Date
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
PKPenguin321
bceca977ec adds scooters and skateboards
adds scooter.dm for pretty much all scooter-and-skateboard related code
added ability to make a scooter frame to rods.dm
added sprites for the scooter, the skateboard, and the scooter frame to vehicles.dmi
2016-03-12 19:27:48 -08:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
MrPerson
b0d511eff2 Automatic stack merging
When a stock moves onto the same tile as another stack, they merge together. Unless it was being thrown, in which case no, they don't merge. Unless the stack was the original target to begin with, then yes, they do merge.

Just a convenience feature. The one downside is that crowbarring up a floor tile won't merge with other tiles on the floor, but if someone makes that event call Move() like it's supposed to, it should work fine. That would just be out of scope for this PR.
2015-08-01 10:34:50 -07:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Jordie0608
2b9c8ac98c fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons 2015-05-17 01:58:46 +10:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
phil235
549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
Menshin
47ec0bbca7 Fixes icon updating for rods 2015-02-07 22:48:10 +01:00
phil235
f6b0f57e89 last fixes I hope:
tiny change to latexballoon (b/c I reorganized is_sharp proc already, so why not)
some fixes suggested by razharas in table.dm
Renamed microwave to microwave oven. Adding efficiency effect (upgrading the machine)
Adding rolling pins to the kitchen vending machine (so the two cooks don't fight.
2015-02-07 20:10:11 +01:00
phil235
63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00
phil235
faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
paprka
50e152f402 rods 2015-02-02 00:20:22 -08:00
phil235
22e0771eb9 Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs. 2014-11-28 16:08:59 +01:00
paprka
28b1d8bef0 fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk 2014-11-03 20:41:40 -08:00
paprka
ffd02c45c2 second commit for table redoing 2014-11-02 10:52:25 -08:00
paprka
85de5f7cd5 initial commit for table overhaul 2014-11-01 23:57:01 -07:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Cheridan
d2021e1bcd Merge pull request #3107 from Jordie0608/dancefloorisbetterthantheprancefloor
Fixes wirecutters and multitools lacking attack sounds
2014-03-20 11:19:14 -05:00
Jordie
f32f81d5b5 Hitsound for rods 2014-03-20 15:43:39 +11:00
Ergovisavi
57fe8ea3f4 Various mineral/material standardizations, minor mob changes 2014-03-19 18:28:56 -07:00
Hornygranny
2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Hornygranny
9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
hornygranny
04aeb15af7 Rebalanced strange throwforces 2014-02-13 17:47:25 -08:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Kyrah Abattoir
7e2b7805cc FIXED: inconsistencies with stack item names.
CHANGE: stacks are gender = PLURAL by default because it fits.
2013-11-24 00:14:46 +01:00
Ikarrus
b0e8d18e30 -Rewrote unequipping modules for cleaner code
-Cyborg rods now properly regenerate in while charging
-cyborg rods can no longer be used to generate metal
-Removed roman numerals from the icon
2013-05-15 22:23:07 -06:00
johnsonmt88@gmail.com
867b21c7ce File restructuring!
This brings down a bunch of defines from /code/defines/obj.dm unto their appropriate files.

I've moved morgue.dm from game/machinery into game/objects/structures since that file contains no machines.

I've reorganized the objects/items/stacks folder and made a 'sheets' and 'tiles' folder to keep things separate

I've separated stool_chair_bed.dm into its own folder which now contains the files: stools.dm, chairs.dm, bed.dm and alien_nests.dm to make it a little easier to go through.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4582 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-29 18:00:30 +00:00