c9d600e653
Fixes stack duping.
2015-03-15 19:04:07 +00:00
f5279273f1
Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example.
2015-03-03 23:43:17 +01:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
996d684458
Fix applying gauze on already bandaged and non bleeding person, the operation is now canceled and it only gives the appropriate message.
2015-02-23 14:23:25 +01:00
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
2885470c50
Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials
2015-02-14 13:45:23 -05:00
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
47ec0bbca7
Fixes icon updating for rods
2015-02-07 22:48:10 +01:00
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
63456ef622
Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog.
2015-02-07 03:10:32 +01:00
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
6299c546ab
fixes a runtime related to stacks
2015-02-04 18:05:45 -08:00
6648390bf5
Merge branch 'master' of https://github.com/tgstation/-tg-station into rodslel
...
Conflicts:
icons/obj/items.dmi
2015-02-03 22:24:00 -08:00
50e152f402
rods
2015-02-02 00:20:22 -08:00
ce65ad8c62
fixes some gauze inconsistencies
2015-01-31 23:27:23 -08:00
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
cc94e4eb9c
changelog and nerf
2015-01-26 03:58:23 -08:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
d26e40a6ee
Merge pull request #7282 from Firecage/SkinningMonkeysXenos
...
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-24 14:06:13 +01:00
f071655ea4
updates and optimizations
2015-01-24 01:12:57 -08:00
2228b443a7
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-22 15:17:22 +02:00
13070880cb
adds IV drips
2015-01-21 16:00:57 -08:00
39d5fa01d8
update, gauze, etc
2015-01-21 15:06:21 -08:00
3c69773a6c
changes usr to user and adds another check.
2015-01-18 19:34:51 +02:00
6e8fdc8b57
A fix so mineral floor tiles can be reshaped into mineral sheets.
2015-01-17 23:55:25 +02:00
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
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
86405fa8c0
Standardizes attack messages to always show the attacker first (when there is an attacker).
...
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
dce9dadea2
Merge pull request #5914 from paprka/removewindows
...
Changes most border windows/firelocks to full tile
Gets paprika killed
2014-11-21 11:47:04 -08:00
85f735c504
Merge pull request #5878 from phil235/DroneShardFix
...
Fixes drones cutting their hands when using shards.
2014-11-17 09:55:19 +00:00
fd910387c3
windows damage and such
2014-11-16 17:13:33 -08:00
2340caa309
Fixes drones cutting their hands when using shards.
2014-11-13 17:54:41 +01:00
ed4c03b099
Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel
...
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
2014-11-12 22:50:32 -03:00
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
f268f3d357
Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
2014-11-03 18:31:43 -08:00
ffd02c45c2
second commit for table redoing
2014-11-02 10:52:25 -08:00
85de5f7cd5
initial commit for table overhaul
2014-11-01 23:57:01 -07:00
b9f5947f5e
High-traction Floor
2014-10-31 01:50:31 +00:00
0bb462e857
Fixes botcall conflicts, removes even more cruft and unused code
2014-10-30 20:36:30 -03:00
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
b971a09bcd
Wrapping something with package wrapper now gives a message.
...
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02:00
e556867a58
Merge pull request #5277 from paprka/newshotguns
...
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
cd5720b6a7
Floor refactor, try #1
2014-10-19 16:48:35 -03:00
929662ad3a
moved files and fixed tablecrafting
2014-10-17 10:30:04 -07:00
d244fd6bbd
initial commit
2014-10-15 13:29:19 -07:00
11b8235f66
Href exploit fixing : the bugfree edition
2014-10-14 23:10:38 +02:00
fb3200eba8
* prevent href exploit with stacks multiplier
2014-10-12 01:39:40 +02:00
f5e54f1fa8
Merge pull request #5069 from phil235/WindoorDeconstruction
...
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
47521d5081
More windoor bug fixes. You can no longer build two windoors on top of each other. You can make a windoor_assembly w/ rglass on the same tile as another one as long as they have different directions.
2014-09-30 23:05:18 +02:00
xxalpha