Commit Graph

5636 Commits

Author SHA1 Message Date
c0
73b4e8f5a6 Fixes #11110 2015-08-09 15:22:25 +03:00
c0
2e5cedef74 Added alien organs 2015-08-09 01:12:32 +03:00
c0
f57fe6785c A fix 2015-08-07 01:06:56 +03:00
c0
691f6fb66d Surgery & Organs Rework: Phase 2 2015-08-06 09:56:54 +03: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
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
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
Ikarrus
3ea9de5053 Territory Tagging Fix
Fixed needing to wait for the next payday before you can tag a territory that has it's old tag cleaned off.
2015-07-29 19:10:22 -06:00
phil235
34651d5390 Fixes a runtime when cigarette packets are destroyed. 2015-07-29 13:37:06 +02:00
phil235
dbd53fbf10 Fixes runtime when obj/item/weapon/storage and facehugger call throw_at() 2015-07-29 13:28:07 +02:00
Orange Borg
04e74a4ffd Update girders.dm 2015-07-29 22:29:12 +12:00
Orange Borg
2eb50b644a Fixes small typo in girders.dm
Prevented borgs building a false wall

Fixes #10874
2015-07-29 13:22:48 +12:00
bgobandit
6f49beafed FIXED SPACING ERRORS BECAUSE MY KEYBOARD IS MADE OF CLOWNS-GRADE BANANIUM 2015-07-26 19:30:57 -04:00
Swag McYolosteinen
624572a664 Makes spider vars transfer to next generations
For admin fuckery
2015-07-26 22:20:23 +02:00
phil235
34b9a045fc Fixes non carbon being stunned when thrown and hitting something dense.
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
2015-07-26 20:40:46 +02:00
Razharas
c9870a0fef Merge pull request #10834 from bgobandit/lighterfluff
Fixes lighter-related bugs.
2015-07-26 13:09:12 +03:00
bgobandit
3ec42691b8 Adds more feedback to traitor dehydrated space carp. Fixes spelling. 2015-07-26 00:00:04 -04:00
Jordie
82d964957a Merge pull request #10687 from Steelpoint/OfficerMask
[FLUFF|BALANCE] Security Officers Sec Breathmask in Internals Box
2015-07-25 20:19:38 +10:00
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
Jordie
15a36f1a4e Merge pull request #10666 from duncathan/fuck
Restores RPD placement delay for disposals (#10645)
2015-07-25 19:12:48 +10:00