Razharas
48e2383b40
Merge pull request #12623 from RemieRichards/FatalMeme
...
Ghost Camera!
2015-10-26 03:25:29 +03:00
Razharas
2a075688d8
Merge pull request #12566 from AnturK/isitaplane
...
Makes is_type helpers inline
2015-10-26 03:22:42 +03:00
Remie Richards
c51d719dd9
Merge pull request #12618 from blobbernaut/Blobbernaut
...
Fixes cloaks; Allows more item slots to have armor (such as shoes and gloves)
2015-10-26 00:11:13 +00:00
Razharas
4a5edd6498
Merge pull request #12638 from SuperSayu/jobs_txt
...
Should fix loading from jobs.txt
2015-10-26 03:08:07 +03:00
Remie Richards
2e7cb827f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into CameraObscura
...
Conflicts:
code/modules/crafting/recipes.dm
2015-10-26 00:04:36 +00:00
Razharas
5c94edc8f6
Merge pull request #12441 from xxalpha/swiss_cheese
...
Adds a very small chance of mice chewing power cables.
2015-10-26 03:04:23 +03:00
Razharas
2063d3fe93
Merge pull request #12608 from Fox-McCloud/spacesuit-slowdown
...
Lowers the Spacesuit Slowdown from 2 to 1
2015-10-26 02:53:39 +03:00
Razharas
ea9f21a5e3
Merge pull request #12619 from Robustin/master
...
Brings balance to the universe (Pest Spray nerf)
2015-10-26 02:50:49 +03:00
Remie Richards
b99ecdfbe0
Merge pull request #12597 from AnturK/atoningmycodingsins
...
Action Button Minor Rework Cleanup
2015-10-25 23:02:59 +00:00
Cheridan
ed9b0c35c6
Merge pull request #12612 from phil235/BugFixBoogalooI
...
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
Remie Richards
fa75581074
Merge pull request #12586 from Jordie0608/thisprnotinspiredbyanymemberofthecommunityhonest
...
Selective ooc muting
2015-10-25 19:11:21 +00:00
Cheridan
a53d35e00c
Merge pull request #12548 from tkdrg/ilive_again
...
Adds Chainsaws
2015-10-25 13:09:55 -05:00
Cheridan
10b82ee45b
Merge pull request #12304 from Incoming5643/utility_aint_gonna_cut_it
...
Adding Charge and Staff of Healing to the spellbook + category reshuffle
2015-10-25 05:23:03 -05:00
blobbernaut
57eae7d70d
Update cloaks.dm
2015-10-24 21:37:13 -04:00
blobbernaut
e046023a21
Update cloaks.dm
2015-10-24 21:35:27 -04:00
Vincent
3e6f641ec3
Should fix loading from jobs.txt
...
The jobs controller's list of occupations was reset during roundstart which completely undid that whole load from file thing. It also would have undone any admin edits done while sitting in the lobby.
Also fixed a couple instances where people thought that lists get copied with the = operator instead of passing by reference.
2015-10-24 19:46:44 -04:00
blobbernaut
ac5c67d2a8
Update human_defense.dm
2015-10-24 13:26:44 -04:00
blobbernaut
66d724a9b3
Update human_defense.dm
2015-10-24 03:50:44 -04:00
blobbernaut
32641c20fd
Update human_defense.dm
2015-10-24 03:29:56 -04:00
blobbernaut
c8030a274c
Update human_defense.dm
2015-10-24 03:28:09 -04:00
blobbernaut
7e1f9b1409
Merge remote-tracking branch 'refs/remotes/tgstation/master' into Blobbernaut
2015-10-24 03:26:34 -04:00
Razharas
eeef634a35
Merge pull request #12505 from phil235/AlcoholTweak
...
Changed the effects of alcohol to be more realistic.
2015-10-24 03:15:55 +03:00
Razharas
a837494646
Merge pull request #12542 from KorPhaeron/xenobio
...
Gold slime extract buff
2015-10-24 03:14:59 +03:00
Remie Richards
d524b4acde
Adds a special camera that can see ghosts (if the ghost is orbiting something they are skipped, this is to prevent it being used for power/meta gaming) the Chaplain spawns with one and they can be tablecrafted using a camera and holywater
2015-10-24 00:53:36 +01:00
Remie Richards
c164e41a21
Fixes drone inhands all being on the right
2015-10-24 00:39:19 +01:00
Robustin
2f48487df3
Update hydroitemdefines.dm
2015-10-23 17:29:51 -04:00
Robustin
0664761bab
Update hydroitemdefines.dm
2015-10-23 17:28:42 -04:00
Robustin
8ca04f834e
Update hydroitemdefines.dm
2015-10-23 17:09:50 -04:00
blobbernaut
f327514d3d
Fixes cloaks.
...
Cloaks actually provide the armor that they're supposed to now, hooray!
2015-10-23 16:50:37 -04:00
phil235
5ab3ad56db
Merge pull request #12557 from RemieRichards/Ports-GoonTooltips-ByWireWraith
...
Ports goon tooltips made by Wirewraith
2015-10-23 22:16:22 +02:00
phil235
8f45876c96
Merge pull request #12499 from Shadowlight213/memeglasses
...
Adds an override var to glasses to allow them to see higher invis levels
2015-10-23 20:47:42 +02:00
Cheridan
89680225c0
Merge pull request #12590 from phil235/TransferAmountFix
...
Fixes changing transfer amounts not working for shaker
2015-10-23 13:33:13 -05:00
phil235
da84fcd8d2
- Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.
...
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
2015-10-23 20:00:52 +02:00
Remie Richards
5f96e49f93
Merge pull request #12541 from Anonus/bringing_spooky_back
...
Once again overhauls revenants
2015-10-23 18:12:15 +01:00
Nerd Lord
86aa4a49cd
World.timer is go.
2015-10-23 13:06:18 -04:00
Cheridan
ff05c5323f
Merge pull request #12583 from Steelpoint/Beret
...
[NERF/ARMOUR] Lowers Sec Beret Defence To Helmet Value
2015-10-23 08:04:56 -05:00
Fox-McCloud
04c9b1c90e
Lowers the Spacesuit Slowdown from 2 to 1
2015-10-23 08:27:43 -04:00
Razharas
b5120f0276
Merge pull request #12555 from Jordie0608/notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
...
Syndie nuke and closet mapped to shuttle
2015-10-23 12:29:44 +03:00
KorPhaeron
05fe1c8515
Editing on mobile phones is bad
2015-10-23 04:05:52 -05:00
KorPhaeron
82335324f3
Nevermind
2015-10-23 04:02:30 -05:00
Jordie
94991be225
whoops
2015-10-23 18:41:29 +11:00
Jordie0608
d8cef19a05
operator, savefile and list find update
2015-10-23 18:39:29 +11:00
Cheridan
bbd9c8bcc2
Merge pull request #12553 from KorPhaeron/scanners
...
Removes research scanners from cyborgs
2015-10-23 00:45:22 -05:00
Nerd Lord
d05c81c2d9
This should resolve conflicts and not fail to compile woo woo
2015-10-22 22:10:29 -04:00
Cheridan
6bfa738a24
Merge pull request #12567 from phil235/EffectSystemTweak
...
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
Remie Richards
2ad13eea59
Updates ToolTips system to V1.1, by Wirewraith
2015-10-22 21:40:16 +01:00
AnturK
77d3260894
Action Button Cleanup
...
Removing action_type in lieu of subtypes
2015-10-22 21:34:27 +02:00
KorPhaeron
520fedd2cf
Changed a few gun names
2015-10-22 18:52:40 +02:00
phil235
564857d3c9
Fixes changing transfer amounts not working for shaker, drinking glass and condiment bottle. And remove it from damp rag and shot glass, since they only have one possible tranfer amount. Fixes the shaker's name being capitalized for no reason (and without an \improper ).
2015-10-22 18:40:32 +02:00
Jordie0608
0d67f24e33
Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
...
Conflicts:
_maps/map_files/DiscStation/DiscStation.dmm
2015-10-23 01:01:02 +11:00
