Cheridan
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
Remie Richards
fcbd841b60
Merge pull request #11138 from Miauw62/eckeck
...
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 13:03:10 +01:00
Miauw
ad1da7c157
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 14:00:05 +02:00
Cheridan
4313c9c343
Merge pull request #11089 from RemieRichards/ItemDropMouseOpacity
...
Fixes items keeping mouse opacity if their container is destroyed
2015-08-09 21:47:57 -05:00
Cheridan
b7ca110654
Merge pull request #11096 from Incoming5643/chen_goes_fishing
...
Stepping on horns now invokes the proper experience
2015-08-09 18:49:35 -05:00
Cheridan
63698004d6
Fixes Conflicts, Also Structural Code Stuff
2015-08-08 20:16:53 -05:00
Cheridan
d915997ea7
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057
...
Conflicts:
icons/obj/items.dmi
2015-08-08 19:36:36 -05:00
phil235
70a8046081
Merge pull request #10815 from bgobandit/bagtags
...
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
bgobandit
1f3440649a
fixes my shit
2015-08-08 19:49:09 -04:00
CosmicScientist
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
Incoming
ed6b59c78e
Stepping on horns now invokes the proper experience. Now the clown can honk even if you disable its hands.
...
#NotDeadJustBusy
#ThisIsOverADecadeTooLate
2015-08-08 01:05:40 -04:00
Remie Richards
9fb63dbec9
Fixes items that survive a storage container's destruction keeping the storage mouse_opacity
2015-08-07 23:02:28 +01:00
Jordie
63c545346d
Merge pull request #10992 from RemieRichards/AlternateWornLayer
...
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
Jordie
9aa0fcf55f
Merge pull request #11015 from Core0verload/bedsheets
...
Better sprites for bed and bedsheets
2015-08-07 19:36:15 +10:00
Cheridan
eb210ab6e8
Adds Astral Carpet Tiles
2015-08-05 23:46:49 -05:00
Remie Richards
bcc55795f6
Merge pull request #10973 from MrPerson/automatic_stackomatic
...
Automatic stack merging
2015-08-06 02:33:45 +01:00
phil235
cdb8a5731b
Merge pull request #11042 from Core0verload/fixedmyshit
...
Fixes implants not showing on HUD
2015-08-05 22:42:42 +02:00
c0
1e96bf29af
Fixed implants on HUD
2015-08-05 23:09:07 +03:00
phil235
4e5be438cd
Merge pull request #10990 from RemieRichards/StorageUnequipUsability
...
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00
c0
2504affdcf
Better sprites for bed and bedsheets
2015-08-04 15:39:28 +03:00
Jordie
d5a88d3f98
Merge pull request #10957 from Core0verload/surgery-organs-implants
...
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
c0
667d5e75c3
Transferred body eggs to new organs system
2015-08-03 23:24:17 +03:00
Remie Richards
db22dd672e
Merge pull request #10962 from Core0verload/weneedtogodeeper
...
Removes some annoying inventory tetris with storages in storages
2015-08-03 17:15:11 +01:00
Remie Richards
f124fe7a25
Merge pull request #10955 from Core0verload/ghostnotify
...
Changes cloning ghost notifications to be less copypasta/snowfake
2015-08-03 05:24:26 +01:00
Remie Richards
af7a671097
Merge pull request #10921 from phil235/StorageThrowFix
...
Storage throw runtime fix
2015-08-03 05:17:50 +01:00
Remie Richards
47fe31346e
Adds alternate_worn_layer, like alternate_worn_icon it allows an item to slightly bend the rules of worn item rendering, DOES NOT MODIFY THE STANDING_ICONS INDEXES, BECAUSE THAT WOULD BREAK THINGS
2015-08-02 22:45:18 +01:00
Remie Richards
786709093c
Makes it so clicking on the storage window of a storage item (backpack,box) acts as if you clicked the item, removing it from the storage, and equipping it, NO MORE PIXEL HUNTING!
2015-08-02 20:59:02 +01:00
c0
600d424ea5
Moved cyberimplants to internal organs system
2015-08-02 22:28:45 +03:00
Cheridan
72d7f0afd4
Merge pull request #10974 from phil235/DoorAssemblyFix
...
Fixes a warning during compilation.
2015-08-02 13:52:07 -05:00
Cheridan
88b2180017
Merge pull request #10949 from phil235/SleepSmokeFix
...
Fixes sleeping smoke never disappearing.
2015-08-02 06:56:47 -05:00
Cheridan
7763263cc0
Merge pull request #10940 from Incoming5643/no_glove_no_love
...
Syndicate toolboxes now come with insulated gloves
2015-08-02 06:35:42 -05:00
c0
8e0e6f3191
Tweaks and fixes
2015-08-02 00:37:29 +03:00
phil235
0e91f254b9
Fixes a warning during compilation.
...
Removes some unneeded code lines.
2015-08-01 19:46:36 +02: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
phil235
3cb8df6e8d
Merge pull request #10948 from SvartaSvansen/disintegrating-airlocks
...
Fixes disintegrating airlocks.
2015-08-01 17:24:21 +02:00
c0
d70acbc7a8
Second level storages are not closing on mob movement
2015-08-01 02:59:06 +03:00
c0
1c93a6e708
Swapped some lines, not sure why
2015-08-01 02:03:16 +03:00
c0
47524811c5
Renamed "glass case" -> "implant case". Changed implant syndiekit to be less FUCKS.
2015-08-01 01:56:54 +03:00
c0
04f7b3f2de
Surgery, Implants and Organs rework: Phase 1
2015-07-31 22:18:31 +03:00
c0
95285e7946
Changed cloning ghost notifications to be less copypasta
2015-07-31 18:42:03 +03:00
phil235
6a0be8b9a3
Fixes sleeping smoke never disappearing. Also switching processing.Add(src) to processing |= src.
...
Makes the empty space on the chem bottles sprites clickable.
Fixes a runtime with reagent_containers/throw_impact()
2015-07-31 15:01:35 +02:00
Cheridan
a35770928d
Merge pull request #10929 from Ikarrus/gangganggang
...
Gang Mode Fixes
2015-07-31 01:41:53 -05:00
SvartaSvansen
e12d47aab6
Centcom airlock assemblies! No more disintegrating airlocks!
2015-07-31 01:41:02 -04:00
Cheridan
5b7c29073d
Merge pull request #10872 from phil235/DisposalStuff
...
Some disposal fixes
2015-07-30 17:30:18 -05:00
Incoming
e2c39a20f4
RemieRichards wins the technical code semantics fight today
2015-07-30 17:55:35 -04:00
Incoming
248b1f5c96
Syndicate toolboxes now come with insulted gloves (that look like red gloves). Wires are lost as a consequence.
2015-07-30 17:28:11 -04:00
Remie Richards
f212ac2502
Merge pull request #10877 from Miauw62/spiders
...
Some spider improvements
2015-07-30 20:08:32 +01:00
phil235
95be17923e
Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
...
Conflicts:
_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
Jordie
ce4df8c636
Merge pull request #10914 from optimumtact/patch-4
...
Fixes small typo in girders.dm
2015-07-30 20:44:37 +10:00
Ikarrus
89f539b804
no message
2015-07-29 19:11:03 -06:00
