as334
f5601b2b4f
Wake me up inside(Fixes small compile issue)
2015-10-25 15:57:07 -04:00
as334
f116ba5c32
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-10-25 15:39:42 -04: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
as334
202eefe635
Fixes the compile issue, adds myself to admin.txt
2015-10-25 14:45:18 -04:00
Incoming
0ce740fa94
Fixes dropable bloodcrawl hands, you need both of these when the item is something you keep in your hands.
2015-10-25 14:39:59 -04:00
Cheridan
a53d35e00c
Merge pull request #12548 from tkdrg/ilive_again
...
Adds Chainsaws
2015-10-25 13:09:55 -05:00
Tkdrg
66d2e28e3a
Adds googly eyes for animated mimics
...
The eyes also follow their targets.
Fixes #3522
2015-10-25 14:35:19 -03: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
Shadowlight213
f52bb39674
Adds OOC banning
2015-10-25 00:45:48 -07:00
Tkdrg
c2093e3709
Improves starlight performance
...
Still laggy, but now quite a bit better.
Fixes #8154
2015-10-25 01:55:04 -03: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
KorPhaeron
a41682ab4c
Fixes spam
2015-10-24 20:11:51 -05: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
Incoming
e641abeaf3
Fixes a goofy bug(?) where if you let yourself be killed by an NPC headslug you, the dead guy getting gibbed, gain control of the resulting ling. While said ling would still technically be "station aligned" people could use this to "add" changeling status to any other kind of antag, which is a really dangerous/hilarious situation.
...
Kudos and apologies to those that managed to figure this out.
2015-10-24 03:01:09 -04:00
Tkdrg
35d09e7cc0
Adds Admin-only Antag HUDs
...
Togglable by a verb in the Admin tab. Only Rev, Cult, Ops and Shadowling
atm because the others don't have huds/have more than one hud and I'm
too lazy to handle it properly here. Also adds a debug verb for huds.
2015-10-24 02:53:38 -03: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
Incoming
87cae6557a
Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live
...
Conflicts:
icons/mob/actions.dmi
2015-10-23 20:06:31 -04: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
GunHog
b10850718a
Merge remote-tracking branch 'remotes/upstream/master' into Diag_Huds
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-10-23 18:53:30 -05:00
GunHog
438babc197
HUD fixes
...
- Data HUDs that apply only to humans (medical, security) are now
prepared only for humans, preventing errors.
- The RD's hardsuit helmet now deactivates its own HUD if a diagnostic
HUD item is worn.
- HUDs on newly spawned entities now update properly.
2015-10-23 18:47:58 -05: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
JJRcop
d265ab71f3
Merge remote-tracking branch 'upstream/master' into chronosuit_phase_better
2015-10-23 17:00:12 -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
JJRcop
8e7007a9d4
Chronosuit uses next_move instead of next_click
...
face_atom doesn't do anything if notransform is nonzero
Added Timeline Eradication Agent outfit
2015-10-23 16:26:49 -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
GunHog
d37805e093
Adds HUD items
...
- Adds Diagnostic HUD to Sci
- Adds NV Diagnostic HUD as well
2015-10-23 14:19:17 -05: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