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
JJRcop
a05bf99c8f
New chronosuit teleport mechanics
2015-10-22 22:58:41 -04: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
GunHog
ac7be61569
Adds Mechs and Borg cells to HUD
...
- Cyborg cells are now tracked.
- Mech health, cells, and status now tracked
2015-10-22 18:45:08 -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
Jordie0608
1f1880e3f9
selective ooc muting
2015-10-23 00:41:01 +11:00
GunHog
96317030a1
Diag HUDs 2
...
Adds Diagnostic HUDs
2015-10-22 08:15:09 -05:00
phil235
8fb8f61674
Merge pull request #12413 from Shadowlight213/Youknowthetruthanditwearscatears
...
Enables job restrictions for roundstart catpeople even if the config is off
2015-10-22 12:25:32 +02:00
KorPhaeron
154a706518
Red paint
2015-10-22 02:18:12 -05:00
Steelpoint
23f4ee77ea
BeretChange
2015-10-22 15:08:40 +08:00
Razharas
467b28d263
Merge pull request #12533 from Jordie0608/ghoststoocannowenjoypointlessexposition
...
Local narrate to all mobs
2015-10-22 09:47:09 +03:00
KorPhaeron
4878ddc0ee
Remove hats, human respawn, mob layer
2015-10-21 23:23:46 -05:00
Nerd Lord
773649067d
/span>
2015-10-21 22:41:23 -04:00
Cheridan
fd09e91f4c
Merge pull request #12522 from optimumtact/readds_paralyse_sting
...
Readds the parasting
2015-10-21 19:06:19 -05:00
Cheridan
3128680825
Merge pull request #12547 from optimumtact/patch-3
...
removes comments that do not contribute to code understanding
2015-10-21 19:01:36 -05:00
phil235
fb7ad8b38f
Merge pull request #12452 from Xhuis/radical
...
Radiation tweaks and a geiger counter
2015-10-22 01:13:00 +02:00
Tkdrg
0458f939b4
Adds Chainsaws
...
Happy Halloween!
Sprites by WalterJe.
These are force 21 two-handed weapons. They are sharp and can be
tablecrafted by spending one circular saw, one plasteel sheet, and one cable
coil, plus a welding tool for crafting. The sound used is from the
freesounds.org and was released into the public domain. It is available
at https://www.freesound.org/people/esperri/sounds/118972/ .
This is a rehash of PR #6320 if you're feeling dejavu.
2015-10-21 20:11:29 -03:00
phil235
e85ae646a3
Merge pull request #12524 from kingofkosmos/newphotocopiericon
...
New photocopier icon
2015-10-22 00:51:10 +02:00