e47b75c02f
Strip Menu now obscures items based on flags_inv
...
I also made it look pretty
2014-05-31 13:45:14 -06:00
b97fd1f884
Merge pull request #3809 from Cheridan/eugh
...
Removes a word from ion_storm.dm
2014-05-31 17:58:46 +01:00
47eeeefe31
Merge pull request #3731 from Ikarrus/internalshelp
...
You can now set internals on someone else's belt and suit storage
2014-05-31 11:43:47 -05:00
030647d6cc
Merge pull request #3718 from hornygranny/cheeseallthewaydown
...
sliceable snacks no longer infinitely stack
2014-05-31 13:56:03 +02:00
c71f289c3c
changed false comment
2014-05-30 10:13:22 -07:00
9bb79d6888
removed things handled by unEquip
2014-05-29 10:39:31 -07:00
3c7897f6de
removes a word from ion_storm.dm
2014-05-28 23:29:35 -05:00
c4a3d8dbe8
redundant w_class removed
2014-05-27 13:56:43 -07:00
bc582490db
storing moved to sliceable/store/attackby()
2014-05-27 13:52:56 -07:00
67482d6e87
Merge pull request #3794 from Menshin/power_distribution_tweaks
...
Power distribution tweaking
2014-05-27 10:04:25 +01:00
26813fc6ac
What is this it shouldn't be here.
...
It's gone now
2014-05-25 11:15:41 -06:00
769a220740
I honestly don't remember making these changes before
2014-05-25 11:10:52 -06:00
82b861702f
Resolved Conflicts:
...
code/modules/mob/living/simple_animal/constructs.dm
2014-05-25 10:59:08 -06:00
6749f21042
Tweaked the power distribution handling :
...
* the power is correctly handled each tick instead of 1 tick on 2, because of bad reinitalization,
* apcs now draw power as others machines and fixed the amount of power send to them
Partially fixes #3761 .
2014-05-25 00:54:41 +02:00
97a25607ca
Merge pull request #3748 from Cheridan/wizardDidIt
...
Bugfixes
2014-05-24 19:50:46 +02:00
2494e8327e
you can no longer store infinite items in sliceable food
2014-05-23 10:45:49 -07:00
f08fe20d60
sliceable items that can store things moved into new type
2014-05-23 10:13:38 -07:00
201d6082e4
Merge pull request #3757 from Rolan7/Bugfixes_5-19-14
...
Fortune cookies can be made with blank or "blank" paper.
2014-05-22 16:48:07 +01:00
aaec78f754
Merge pull request #3745 from Miauw62/autism_intensifies
...
Fixed #3740 , slimes now attack simple_animals in retaliation.
2014-05-22 10:09:51 +01:00
5576282bb6
Merge pull request #3747 from hornygranny/karmachameleon
...
Fixes #3744
2014-05-22 10:05:03 +01:00
2c577af52f
Merge pull request #3741 from Rolan7/Issue3643-NoclientIcons
...
Sets screenloc even if no client
2014-05-22 10:04:21 +01:00
18ebcc0e45
Merge pull request #3720 from hornygranny/readingrainbow
...
carved books now turn into storage items
2014-05-21 22:16:45 -05:00
79a4de45e7
Merge pull request #3729 from Ikarrus/immovablerod
...
Fixes Immovable Rod
2014-05-21 21:45:14 -05:00
3cf8624665
Finalizes the fixes.
2014-05-20 20:14:01 +02:00
08d5b5907a
Fortune cookies can be made with blank or "blank" paper. Allows cult talisman paper to be baked into cookies, fixing the last bit of issue #298 .
2014-05-19 18:21:17 -04:00
38ab0be4ad
Spells are now anchored.
...
Space Carp and Bears now take damage from high temperatures.
2014-05-19 15:06:54 -05:00
2360d82c6a
Fixes #3744
2014-05-19 12:43:04 -07:00
8ac429ab9c
Made slimes able to feed on simple_animals.
2014-05-19 21:03:26 +02:00
b5f61f59d3
Fixed #3740 , slimes now attack simple_animals in retaliation.
2014-05-19 19:33:38 +02:00
92d138533f
Added the fix to the back slot, had overlooked it.
2014-05-19 13:30:49 -04:00
992ec337e6
Put the hud_used.hud_shown checks back for hideable inventory slots, preventing the placed items from floating in empty space above the closed inventory.
2014-05-19 05:37:46 -04:00
31d69ef4f5
Sets the screenloc property for items in update_icons even if there's no client at the moment (possibly because the player has lost the connection temporarily).
2014-05-19 02:48:53 -04:00
a36afba82a
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison. Went with my solution.)
2014-05-18 20:50:38 -04:00
1d4a6c5d26
Merge branch 'master' into slimes
...
Conflicts:
code/modules/mob/living/carbon/metroid/metroid.dm
2014-05-18 21:38:25 +04:00
ed5f8a0ee6
Fixes, part 1
2014-05-18 21:27:40 +04:00
5f7875f4de
Replaced the "not used anymore" command_alert with the new "priority_annonce" proc, making the code compilable again.
2014-05-18 11:50:25 +02:00
9066cccf9c
Merge pull request #3645 from Ikarrus/announcements
...
Priority Announcement Changes
2014-05-18 02:07:55 +01:00
6dbdc37e04
Resolved Conflicts:
...
code/modules/events/immovable_rod.dm
2014-05-17 18:46:53 -06:00
36bb032957
Merge pull request #3509 from Cheridan/MeteorsSuck
...
Meteor Stuff
2014-05-17 18:42:16 -05:00
4926933e41
You can now set internals on someone else's belt and suit storage
2014-05-17 15:24:07 -06:00
f861f12075
Fixes Immovable Rod
...
-Rod no longer gets deleted after hitting a few objects
-Rod no longer gets stuck in the rare case it hits a shuttle at just the right angle. It now explodes.
2014-05-17 14:30:24 -06:00
d0015287de
carved books now turn into storage items
2014-05-16 14:30:04 -07:00
1d7fb426c2
sliceable snacks no longer infinitely stack
2014-05-16 11:47:05 -07:00
86e36fb934
Merge pull request #3598 from phil235/ConstructHitFix
...
Stops constructs from hitting themselves
2014-05-15 12:56:38 -05:00
a016d1463a
Merge pull request #3608 from hornygranny/lookmanohands
...
Fixes #3157
2014-05-15 12:50:22 -05:00
503fa19098
Merge pull request #3695 from Menshin/powernets_alternative_refactoring
...
Updated Powernets Refactoring
2014-05-15 13:55:01 +01:00
e87d84fbe4
Merge pull request #3694 from Rolan7/Issue2883-medal
...
Medal of Captaincy is no longer twice as large.
2014-05-15 11:55:57 +01:00
758d9a38d7
Merge pull request #3649 from Cheridan/vitallyimportant
...
Less Hydro Trash
2014-05-14 16:11:34 +01:00
01c28c7afc
Fixed indentations.
2014-05-14 09:02:53 -06:00
ea3d4b35c4
fixing conflict
2014-05-14 10:01:29 -05:00
ikarrus
Alex
Cheridan
Miauw62
Hornygranny
Menshin
Rolan7
Kelenius