32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
87eae12f89
Merge pull request #11425 from bgobandit/golemsandglass
...
Golems no longer take damage from attacking with glass shards.
2015-08-29 11:17:34 -05:00
14bd455287
Button frame added to metal
2015-08-28 02:04:33 +03:00
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
1009c08ff4
Golems no longer take damage from attacking with glass shards.
2015-08-27 14:55:48 -04:00
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
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
2d2e1acf6a
Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder
2015-07-28 20:19:26 +01:00
452313a5fa
Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
...
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
f40b4381d4
Separates construction into the door and a frame
2015-07-11 11:25:14 -04:00
49cb301318
Fixed plasma not stacking.
2015-07-07 17:38:23 +01:00
d03006d17b
Merge pull request #10304 from TheVekter/dogbedwoofwoof2
...
Replaces the crate in HoP's office with a dog bed
2015-07-03 04:27:48 +03:00
4a86be4883
Merge remote-tracking branch 'upstream/master' into boxesofbananium
...
Conflicts:
code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
6595a39147
Plasma sheets can burn now
2015-07-01 13:33:05 -06:00
27ed60102d
They're craftable now!
2015-07-01 00:41:49 -05:00
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
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
46acc2a55d
REMOVES CABLE CUFF
2015-06-06 16:21:41 -05:00
061478165a
upgrades the HARDFEET species flag to PIERCEIMMUNE
...
In addition to keeping golem feet safe as always golems are now immune to object embeding. As a mitagating nerf and logical extension, golems can no longer be injected with chems either.
2015-05-31 18:54:30 -04:00
1fb8dcecd1
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-07 15:44:17 +02:00
752032628f
Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
...
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
6996897b65
Fixes fulltile windows not spawning the correct amounts of shards and rods.
...
Fixes broken grille not dropping a rod when shot with buckshots.
2015-04-11 17:41:09 +02:00
c9d600e653
Fixes stack duping.
2015-03-15 19:04:07 +00: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
2228b443a7
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-22 15:17:22 +02: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
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
ffd02c45c2
second commit for table redoing
2014-11-02 10:52:25 -08: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
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
40e0a52283
Repaths clown ore to bananium
2014-09-19 21:26:50 +10:00
caa4d60503
Phase Honk
2014-09-15 12:44:52 +02:00
16502db223
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE
2014-09-15 11:17:44 +02:00
ad5d15a225
New part
2014-09-15 11:16:39 +02:00
d29d3a37da
Fixed welding shard message spam
2014-09-10 11:55:07 +02:00
2bf0773261
First phase of statues part 1
2014-09-06 21:14:27 +02:00
834f9a05b9
Mineral flooring
2014-08-31 17:12:17 +02:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
698fde12f4
Two small bugs...
2014-06-13 01:01:10 +04:00
3908160998
One big update for stacks.
2014-06-10 20:36:08 +04:00
6686b2ec7c
Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz
...
Fixes #3681 : suicide messages when crit
2014-05-14 09:24:29 +01:00
4078973a5c
Unidentinization
2014-05-13 02:18:21 +10:00
dfd2cc4b60
Changed suicide messages to visible_messages and fixed relative pathing
2014-05-13 01:44:29 +10:00
aa2c65aaf4
removing some of my code
2014-04-25 20:44:32 +02:00
ff95095446
Fix for shard
2014-04-25 01:11:29 +02:00
Cheridan