dc9b7f4496
Merge pull request #10184 from Razharas/DatumCrafting
...
Fixes telesci console icon
2015-06-27 20:33:21 +02:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
6ab2eb78e0
Merge pull request #10155 from Ikarrus/shredme
...
Burnable Objects & Clothes [Ready]
2015-06-27 18:29:14 +03:00
59ca40f03d
Burning objects are processed every tick now instead of using a spawn() check
2015-06-27 09:22:14 -06:00
e6602cf123
Merge pull request #4 from tgstation/master
...
Merge with upstream
2015-06-27 10:27:43 +02:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
40a90ab8df
ayy lmao merge conflicts
2015-06-27 00:02:46 -05:00
50c1fc487e
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-26 23:49:43 -05:00
16cdc39d2f
Converts the jacket to a cosmetic, added to autodrobe and clothesmate, doesn't spawn in closets anymore
2015-06-26 23:48:18 -05:00
e6ffb1a922
Fix for playing cards on systems with IE8
2015-06-27 05:51:59 +02:00
1aac98a52a
Merge pull request #3 from tgstation/master
...
Merge with upstream
2015-06-27 05:01:13 +02:00
46d7fb9bbd
Merge pull request #10168 from phil235/FireaxecabinetFix
...
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
f06abf3e2f
fixes compile error
...
One pr added a path to an item(#10018 ) but another pr changed that path(#9932 ).
2015-06-26 16:06:37 -07:00
b4ab182867
Merge pull request #10142 from phil235/SleepypenFix
...
Fixes sleepy pen triggering morphine overdose message.
2015-06-26 15:54:27 -05:00
a65ba96ecf
Merge pull request #10020 from phil235/HiveloardCoreSmearing
...
Changing messages when using hivelord core
2015-06-26 15:45:31 -05:00
b9cdb3384a
Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
...
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
3f1ecc5721
Merge pull request #10097 from phil235/SomeFixes
...
Some little fixes
2015-06-26 15:24:46 -05:00
ee13658752
Merge pull request #10018 from pudl/sam
...
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
2e61607d3f
Merge pull request #10105 from xxalpha/chief
...
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
adf553db5c
Removes the singularity's toxin damage effect on mob.
2015-06-26 18:14:34 +02:00
f104517c89
Merge pull request #10146 from phil235/QueenUnconsciousIconFix
...
Fixes stomach rumbling message, large xenoqueen unconscious icon, stamina stacking on aliens
2015-06-26 10:51:47 -05:00
0b91e9d8e4
Merge pull request #10126 from Jordie0608/idkhowtheserverevenranwiththiserroraround
...
Critical fix to admin memos and watchlist
2015-06-26 10:44:03 -05:00
a93c340c4f
Merge pull request #10138 from spasticVerbalizer/cancelAgentID
...
Adds a cancel button for the agent ID dialogs
2015-06-26 10:40:15 -05:00
8c9169f9a8
Merge pull request #10144 from phil235/StimulantsBuff
...
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
3c15ee4731
Merge pull request #10157 from KorPhaeron/rightandwrong
...
Summon Guns once again creates antagonists
2015-06-26 10:22:14 -05:00
530ae039a4
Merge pull request #10124 from Ikarrus/gangtweak2154
...
Gang Tweaks
2015-06-26 10:09:37 -05:00
1ce57fa0b9
Merge pull request #10130 from xxalpha/fixfixfix
...
Fixed reviver implant emp_act() resetting cooldown time.
2015-06-26 10:00:28 -05:00
792a30413e
Fixes telesci console icon
2015-06-26 17:03:29 +03:00
88ee215429
Removed arm protection from jacket
2015-06-26 02:37:54 -05:00
d3f78294ad
fixes edit reason and log for follow
2015-06-26 16:13:40 +10:00
9ae5728a78
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-25 19:15:08 -05:00
90a6a8ca96
Revert "Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS""
2015-06-26 02:45:02 +03:00
97aaa5fb8d
Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…"
2015-06-26 02:44:20 +03:00
69d6cd4f94
Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more"
2015-06-26 02:16:02 +03:00
a40697c545
Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS"
2015-06-26 02:12:29 +03:00
f45127b03c
MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS
...
how did I not notice this AAAAAAAAAAA
2015-06-25 15:28:57 -07:00
15cdf9bfca
Merge from upstream.
2015-06-25 20:30:19 +02:00
2aeefad94d
Fixes runtime with do_after()'s that don't use a target.
...
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
2015-06-25 19:05:23 +02:00
9c78f12c50
removes blue gang name
2015-06-25 09:37:50 -06:00
031a98d14c
Merge pull request #9836 from AnturK/viral
...
Makes viruses varedit friendly
2015-06-25 14:09:50 +02:00
8e62d51812
Merge pull request #9801 from AnturK/rosebud
...
Buffs whispers
2015-06-25 13:39:56 +02:00
454dc14b44
Merge pull request #10117 from Iamgoofball/explosive_implant
...
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
2015-06-25 12:49:03 +03:00
5170693100
Removed extra line, thanks Incoming
2015-06-25 03:37:48 -05:00
27b5d59d28
Ports over the military jacket from NTStation
2015-06-25 02:44:25 -05:00
91556b65fa
Wizards have no sense of right and wrong
2015-06-25 02:10:52 -05:00
3d5f126779
Destructible Clothing [WIP]
...
- Clothes can be set on fire and extinguished
- Any item can technically be set on fire and extinguished now, but only clothes (and paper) actually burn right now
- All of a mob's clothing are burned if the mob is husked by fire
- Clothes will also have a chance of being shredded if you are caught in a bomb blast
- The bigger the explosion, the higher the chance they have of being destroyed
- Outer layer clothing (headgear and exosuits) take the shock first, which absorbs some of the shock for the clothes it covers, according to it's bomb armor
2015-06-25 00:06:47 -06:00
2cdb4dbe92
fixes
2015-06-24 22:07:46 -07:00
0449b61f5c
Bugfixes and sprites
2015-06-24 19:03:46 -06:00
28a030360c
Fixes wrong message when a mob moves while inside another mob's stomach.
...
Fixes large xenoqueen having wrong icon when unconscious.
Aliens now naturally recover from stamina damage.
2015-06-25 02:15:49 +02:00
phil235
LaharlMontogmmery
Razharas
Ikarrus
nullquery
TheVekter
Cheridan
MrStonedOne
phil235
Razharas
TheVekter
Jordie0608
Iamgoofball
KorPhaeron