c0
73b4e8f5a6
Fixes #11110
2015-08-09 15:22:25 +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
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
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
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
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
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
bgobandit
6f49beafed
FIXED SPACING ERRORS BECAUSE MY KEYBOARD IS MADE OF CLOWNS-GRADE BANANIUM
2015-07-26 19:30:57 -04: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
Jordie
9b0b4e1aa4
Merge pull request #10710 from xxalpha/cablecoilbackpack
...
Fixed storage not updating when joining cable coils.
2015-07-25 19:12:26 +10:00
Jordie
cd280f9d9f
Merge pull request #10779 from xxalpha/rw_agent
...
Made Agent IDs rewrittable.
2015-07-25 19:11:06 +10:00
Jordie
ad2d7e1d0f
Merge pull request #10789 from kingofkosmos/reentercorpselink
...
Clickable re-enter corpse links
2015-07-25 19:10:06 +10:00
bgobandit
717be49a3c
Fixes lighter-related bugs.
2015-07-24 11:00:23 -04:00
Steelpoint
68b5dd2979
Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/obj/guns/energy.dmi
2015-07-24 16:59:21 +08:00
Cheridan
05e227073d
Merge pull request #10782 from phil235/VendingCharges
...
Mech & vending machine fixes
2015-07-24 00:02:31 -05:00
kingofkosmos
750e5d9b5e
Changed span classes to include the re-entering link.
2015-07-23 18:58:15 +03:00
phil235
1ab69f9fda
Readding loading chef food into snack vending mechines.
...
Adding a mention about being able to load food into snack vending machines in the cook book.
Removing the power setting of the microwave. The microwave upgrades makes it unneeded.
2015-07-23 16:06:03 +02:00
Jordie
b2948fcab7
Merge pull request #10659 from phil235/HandcuffOverlayFix
...
Handcuff, fire, overlays_standing fixes
2015-07-23 22:21:52 +10:00
kingofkosmos
0095637eee
Clickable link added to all re-enter corpse messages.
2015-07-23 10:50:45 +03:00
xxalpha
2aa05fdc45
Changed input method
...
Edit changelog
2015-07-23 04:23:38 +01:00
xxalpha
1759d492f0
Made Agent IDs rewrittable.
...
Added antag check for forging.
2015-07-22 22:38:13 +01:00
phil235
2cf4b90ba8
Give refill canisters three separate charge values for standard, contraband(hacked) and premium(coin) items.
...
So that next time someone increases the amount of items in a vending machine w/o updating the refill charges (looking at you /vending/clothing), it will affect the items in the same product list instead of only contraband.
I also updated the charges of the refill canisters to the correct amounts.
I removed the chef food section of the snack vending machine, nobody has ever used it.
2015-07-22 22:06:04 +02:00
xxalpha
8e00cdfe9a
Fixed storage not updating when joining cable coils.
...
Fixed stack objects not updating storage when deleted.
Added handle_atom_del proc to be called on destroy.
Label comment for handle_atom_del()
2015-07-22 17:58:05 +01:00
Aranclanos
47706cf88b
Merge pull request #10717 from Ikarrus/thisisafix
...
Fixes Reset and Purge having "This is a bug." law on examine
2015-07-21 16:12:43 -03:00
phil235
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
Ergovisavi
e6a8511ac1
Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire
2015-07-21 05:50:02 -07:00
Ergovisavi
5f6cf57e07
Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire
2015-07-21 05:32:08 -07:00
