63698004d6
Fixes Conflicts, Also Structural Code Stuff
2015-08-08 20:16:53 -05:00
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
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
1f3440649a
fixes my shit
2015-08-08 19:49:09 -04:00
1f8a439fb2
Fixes bedsheet-capes sprites.
2015-08-09 01:42:36 +03:00
2e5cedef74
Added alien organs
2015-08-09 01:12:32 +03:00
1c51550559
Changes how mulebots handle loading mobs. It now buckles them to the bot.
...
You can no longer load objects containing mobs or with mobs buckled to them.
You can no longer pass through plastic flaps by getting on a mulebot.
Some simplification in mulebot code (buzzing sound code)
Loading is now instantaneous and the mode BOT_LOADING is removed.
The mulebot can no longer do certain stuff while off.
Removing unneeded comments.
Fixes mulebot loading/unloading being possible through border windows.
Fixes mulebot not dropping its loaded cargo when qdel'd (wasn't a problem for explosion but for alien acid for example)
2015-08-08 21:43:30 +02:00
8a1e4435b6
Adds admin verb to reset latejoin spawns
2015-08-08 18:52:57 +02:00
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
a7b09a84ab
- Made costs and delays variables
...
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
2015-08-08 21:18:45 +12:00
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
9fb63dbec9
Fixes items that survive a storage container's destruction keeping the storage mouse_opacity
2015-08-07 23:02:28 +01:00
866cdbcd34
Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues.
...
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
2015-08-07 23:14:45 +02:00
ebea552319
- Rebalances RCD construction costs around metal construction menu cost values
...
- Makes matter cartridges worth twice as much matter as metal/glass sheets
2015-08-08 06:15:35 +12:00
63c545346d
Merge pull request #10992 from RemieRichards/AlternateWornLayer
...
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
9aa0fcf55f
Merge pull request #11015 from Core0verload/bedsheets
...
Better sprites for bed and bedsheets
2015-08-07 19:36:15 +10:00
4870122858
Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
...
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
f6abc54eb8
Lockers dump their contents if molten by alien acid
2015-08-07 03:28:00 +03:00
d80ecd8c74
Fixes syndie poison kits not being able to hold what they come with
2015-08-07 02:44:46 +03:00
f57fe6785c
A fix
2015-08-07 01:06:56 +03:00
278a3369c5
Fixes reactionary explosion not acting correctly.
...
Fixes indestructible turfs not blocking explosions.
Replacing cheap_pythag by cheap_hypothenuse
2015-08-06 16:53:11 +02:00
691f6fb66d
Surgery & Organs Rework: Phase 2
2015-08-06 09:56:54 +03:00
eb210ab6e8
Adds Astral Carpet Tiles
2015-08-05 23:46:49 -05:00
bcc55795f6
Merge pull request #10973 from MrPerson/automatic_stackomatic
...
Automatic stack merging
2015-08-06 02:33:45 +01:00
cdb8a5731b
Merge pull request #11042 from Core0verload/fixedmyshit
...
Fixes implants not showing on HUD
2015-08-05 22:42:42 +02:00
c2e9592009
Added Changelog And Fixed Smuggler Satchel And Duffelbag
2015-08-05 13:10:57 -07:00
1e96bf29af
Fixed implants on HUD
2015-08-05 23:09:07 +03:00
4e5be438cd
Merge pull request #10990 from RemieRichards/StorageUnequipUsability
...
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00
eaba56cae3
Balance issues
2015-08-04 18:52:42 +03:00
bd8d70ec26
New traitor item: storage implant
2015-08-04 18:28:38 +03:00
2504affdcf
Better sprites for bed and bedsheets
2015-08-04 15:39:28 +03:00
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
667d5e75c3
Transferred body eggs to new organs system
2015-08-03 23:24:17 +03:00
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
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
af7a671097
Merge pull request #10921 from phil235/StorageThrowFix
...
Storage throw runtime fix
2015-08-03 05:17:50 +01:00
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
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
600d424ea5
Moved cyberimplants to internal organs system
2015-08-02 22:28:45 +03:00
72d7f0afd4
Merge pull request #10974 from phil235/DoorAssemblyFix
...
Fixes a warning during compilation.
2015-08-02 13:52:07 -05:00
88b2180017
Merge pull request #10949 from phil235/SleepSmokeFix
...
Fixes sleeping smoke never disappearing.
2015-08-02 06:56:47 -05:00
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
8e0e6f3191
Tweaks and fixes
2015-08-02 00:37:29 +03:00
1d0b41b23a
Changes Backpack Slotcount
2015-08-01 11:29:59 -07:00
0e91f254b9
Fixes a warning during compilation.
...
Removes some unneeded code lines.
2015-08-01 19:46:36 +02: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
3cb8df6e8d
Merge pull request #10948 from SvartaSvansen/disintegrating-airlocks
...
Fixes disintegrating airlocks.
2015-08-01 17:24:21 +02:00
d70acbc7a8
Second level storages are not closing on mob movement
2015-08-01 02:59:06 +03:00
1c93a6e708
Swapped some lines, not sure why
2015-08-01 02:03:16 +03:00
47524811c5
Renamed "glass case" -> "implant case". Changed implant syndiekit to be less FUCKS.
2015-08-01 01:56:54 +03:00
Cheridan
phil235
bgobandit
c0
phil235
AnturK
CosmicScientist
Jim Boonie
Incoming
Remie Richards
Jordie
PatchouliKnowledge
Cheridan
bustygoku
MrPerson