PsiOmegaDelta
93c3d03801
Merge pull request #9817 from GinjaNinja32/records
...
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
PsiOmegaDelta
dea924541c
Emag refactoring.
...
Emags now call a dedicated emag_act proc on atoms which then returns how many charges that should be use up.
2015-06-15 15:22:32 +02:00
GinjaNinja32
0423691ca2
Missed a span
2015-06-15 12:20:16 +01:00
GinjaNinja32
4da75dba68
Fixes some more unbalanced HTML
2015-06-15 10:48:30 +01:00
PsiOmegaDelta
135d0fb515
Map tweaks.
...
Secure windoors now all use the pre-defined direction instances.
Replaces all border emergency shutters with the base variant because they have become mixed, unmatched, and are generally inconsistent in their use (understandable seeing as we don't have border icons).
Rotates the fore bridge blast doors 90 degrees.
2015-06-15 09:08:34 +02:00
mwerezak
637306eb14
Adds holographic plastic
2015-06-14 22:18:11 -04:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
mwerezak
eb0f1fa69e
Makes R-walls double plasteel
...
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
2015-06-14 15:33:48 -04:00
mwerezak
dec1461f6c
Fixes chair preview icon
2015-06-14 14:55:04 -04:00
mwerezak
0d6dfd899a
Makes standard tables plastic
...
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
2015-06-14 13:38:56 -04:00
GinjaNinja32
3c525e907a
'Fixes' NanoUI locking up on medical/security records
2015-06-14 14:44:38 +01:00
Kelenius
86b080769c
Fixes two log destroyers
2015-06-14 15:54:07 +03:00
Mloc
a006089b2a
Merge pull request #9801 from Iamgoofball/patch-3
...
Autolathe now spits out stuff on it's location instead of at your feet
2015-06-14 13:23:27 +01:00
PsiOmega
1a7e8976af
mob/living/Life() now handles fire.
...
Aliens (largery un-used on Bay) and robots now deal with fire differently.
2015-06-14 11:47:11 +02:00
PsiOmega
03be640d01
mob/living/Life() now handles random events (vomiting etc).
2015-06-14 11:17:04 +02:00
PsiOmega
a14406f83a
mob/living/Life() now handles blood.
2015-06-14 11:14:31 +02:00
PsiOmega
240aed884e
mob/living/Life() now handles chemicals in the body.
2015-06-14 11:03:03 +02:00
PsiOmega
9d90691605
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
Zuhayr
6751b8113c
Merge pull request #9806 from GinjaNinja32/dsay
...
Changes to dsay
2015-06-14 15:34:41 +09:30
mwerezak
ad24805eb8
Mob fire temperature fix, tweaks
...
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.
Also made mob fires burn hotter overall and resisting slower.
2015-06-13 15:45:52 -04:00
GinjaNinja32
5e2a95468a
Merge pull request #9809 from mwerezak/zonemerge-master
...
Hotfix for #9235
2015-06-13 18:47:54 +01:00
PsiOmega
8279cc48d8
mob/living/Life() now handles mutations and radiation.
2015-06-13 19:40:24 +02:00
mwerezak
17a84d9dd3
Hotfix for #9235
...
Hotfix for master
2015-06-13 13:37:37 -04:00
GinjaNinja32
8d0c7039df
Changes to dsay
...
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
2015-06-13 16:46:03 +01:00
Zuhayr
7ff2a9415a
Merge pull request #9805 from GinjaNinja32/follow-with-camera
...
Renames Track-With-Camera to Follow-With-Camera
2015-06-14 00:05:04 +09:30
PsiOmegaDelta
5f925d92c7
Merge pull request #9803 from GinjaNinja32/wizardsuit
...
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 15:25:35 +02:00
GinjaNinja32
aa3c68d3c2
Renames Track-With-Camera to Follow-With-Camera
...
Title. This means both AIs and ghosts can get space-completion for following a specific mob from 'fol', rather than AIs needing 'tra' and ghosts needing 'fol'.
2015-06-13 14:12:59 +01:00
PsiOmega
06f2009fbf
mob/living/Life() now handles environment.
2015-06-13 14:45:13 +02:00
PsiOmega
2760836b15
mob/living/Life() now handles breathing.
2015-06-13 14:43:56 +02:00
GinjaNinja32
9613fae16a
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 13:43:51 +01:00
PsiOmega
ee88e7b8b4
Base Life-addition()
2015-06-13 13:36:08 +02:00
PsiOmega
24cd59382c
Absolute Life paths.
...
Changes relative Life paths into absolute to make a potential refactoring easier to manage.
2015-06-13 11:41:37 +02:00
PsiOmega
d989df7e8c
Adds the Jump-To-X verbs to the list of debug verbs.
2015-06-13 09:53:32 +02:00
Iamgoofball
3c89b0ea18
Autolathe now spits out stuff on it's location instead of at your feet
...
all other fabricators spit crap out on their location
why does autolathe gotta be a special snowflake
now with the proper branch
2015-06-13 00:46:59 -07:00
PsiOmega
c2f8e1242e
Expands admin jump permissions, cuts down on superfluous feedback.
2015-06-13 08:44:58 +02:00
Mustafa Kalash
ca4265f157
Typo fix.
2015-06-12 15:39:51 -04:00
Zuhayr
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
Zuhayr
30909aaccd
Merge pull request #9793 from PsiOmegaDelta/150612-HiveTracking
...
Ghosts can now follow hivemind speech.
2015-06-13 01:07:49 +09:30
PsiOmega
57f0a3535c
Observers can now only follow hivespeech as long as the speaker uses its real identity or antagHUD is enabled.
2015-06-12 17:19:29 +02:00
PsiOmegaDelta
784f4d8705
Merge pull request #9792 from Techhead0/requestConsole
...
Request Console part two: NanoUI
2015-06-12 15:42:27 +02:00
PsiOmegaDelta
8c7cbeb093
Ghosts can now follow hivemind speech.
...
Ghosts can now follow hivemind speech with the same targets as for normal speech (separate links for mob and eye if any, etc.).
2015-06-12 15:00:53 +02:00
Zuhayr
b2dacae3eb
Merge pull request #9791 from GinjaNinja32/cryopod
...
Cryogenic/robotic storage now uses alt-title for announcements
2015-06-12 15:18:41 +09:30
Mustafa Kalash
cc56480f99
Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors.
2015-06-11 23:31:25 -04:00
Techhead0
b22afe6a59
Request Console NanoUI and fixes
...
Converts Request Console UI into NanoUI.
Fixes icon state not changing for normal priority messages.
Fixes consoles being partially operational while broken/unpowered.
Removes code for EXTREME priority messages.
2015-06-11 21:43:27 -04:00
Techhead0
5bd05df455
Fixes double request console messages for prison break event.
2015-06-11 19:38:57 -04:00
GinjaNinja32
951a7b7347
Cryogenic/robotic storage now uses alt-title for announcements
...
Fixes #9790 .
2015-06-11 21:44:08 +01:00
PsiOmegaDelta
a0dcb04768
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
code/modules/admin/topic.dm
2015-06-11 12:06:40 +02:00
GinjaNinja32
d31cf8f3d8
Merge pull request #9786 from LightningIron/dev-freeze
...
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
unknown
c062f886c0
Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel.
2015-06-10 22:07:52 -05:00
unknown
fe2ce02f54
Fixes #9744 .
2015-06-10 21:50:48 -05:00
