GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
Chinsky
7b1656f40c
Merge pull request #10470 from Karolis2011/dev-freeze
...
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
Zuhayr
20e7ee0b71
Merge pull request #10111 from mwerezak/eye-attack
...
Makes grab eye attacking respect species lore better
2015-08-12 02:36:50 +09:30
Chinsky
7f2d6e8b7f
Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes
...
Of cables and snowflakes
2015-08-11 19:40:45 +03:00
Zuhayr
7bd301161f
Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes
...
Magical fixes.
2015-08-12 01:54:31 +09:30
PsiOmega
78ffb5835a
Misc.
2015-08-11 17:33:03 +02:00
PsiOmegaDelta
3185005496
Fixes #10410 . Fixes #10411 .
...
Removes improper code, that would cause spell projectiles to be deleted pre-maturely as well as cast the spell effect all too often.
Also removes completely unused code.
2015-08-11 13:36:56 +02:00
SomeoneElse
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d
Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes
2015-08-11 12:20:54 +02:00
PsiOmegaDelta
211a427d65
Crew monitor balance and lag fixes.
...
Creates a central repository for crew data. This repository only updates data as necessary and only every 5th second, no matter how many times it is requested.
Reduces any lag caused by having multiple crew monitor windows open and as a bonus gives antags a larger window of opportunity for disabling sensors before detection of harm.
2015-08-11 09:27:18 +02:00
PsiOmegaDelta
4bb6749f24
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/doors/door.dm
code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00
Chinsky
80c4158cc7
Merge pull request #10460 from PsiOmegaDelta/150809-NDVIcarus
...
Fixes #10447 .
2015-08-10 20:45:11 +03:00
PsiOmega
2f4c71ddbc
Renames definition and compilation fix.
2015-08-10 18:00:50 +02:00
PsiOmega
570806046b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/custom_sprites.dm
code/modules/organs/organ_stump.dm
code/setup.dm
2015-08-10 17:56:14 +02:00
mwerezak
c98b6a1d97
Merge pull request #10457 from Zuhayr/dev-freeze
...
Custom item rolldown.
2015-08-09 10:33:54 -04:00
GinjaNinja32
575ab793a2
Merge pull request #10458 from PsiOmegaDelta/150809-DestroyBuildings
...
Fixes #10217 .
2015-08-09 12:43:08 +01:00
PsiOmega
889f399356
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/area/areas.dm
code/game/machinery/alarm.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/reagents/Chemistry-Machinery.dm
2015-08-09 13:15:22 +02:00
PsiOmega
e0525bec35
Fixes #10447 .
...
Corrects Icarus' designation.
2015-08-09 12:21:52 +02:00
PsiOmega
e350d888e6
Fixes #10217 .
...
Adds destroys to rectify the situation.
2015-08-09 10:52:24 +02:00
PsiOmegaDelta
31b8335298
Merge pull request #10456 from mwerezak/air-alarm
...
Fixes
2015-08-09 10:09:02 +02:00
Zuhayr
b6e6d45952
Small tweaks to get rolldowns to work properly.
2015-08-09 17:01:07 +09:30
Zuhayr
aed2ac3dfe
Moved custom_synthetic.dmi into a proper define.
2015-08-09 16:48:20 +09:30
Zuhayr
9d11a367a6
Roll-down-jumpsuit now works properly with custom items, icon_override and (hopefully) species variants.
2015-08-09 16:22:19 +09:30
mwerezak
b1b3b4899b
Fixes #7928
...
Uses camera/set_status() to ensure viewers are kicked and camera cache updated.
2015-08-09 00:24:18 -04:00
PsiOmegaDelta
4ae754a59d
Merge pull request #10454 from mwerezak/chem-machine-fix
...
Fixes #10021
2015-08-08 19:16:47 +02:00
PsiOmegaDelta
22c500ed2b
Merge pull request #10452 from mwerezak/stump-fix
...
Backports #10331
2015-08-08 19:16:25 +02:00
mwerezak
4e70cc03bc
Fixes #10021
2015-08-08 11:38:27 -04:00
mwerezak
1e3d3101de
Fixes #9966
2015-08-08 11:28:22 -04:00
Kearel
4139a51946
Initial fixes
...
Changes interaction between stumps and items.
Conflicts:
code/modules/organs/organ_stump.dm
2015-08-08 11:10:28 -04:00
PsiOmega
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
PsiOmegaDelta
c560bd8d79
Merge pull request #10404 from mwerezak/stack-fix
...
Material stack related fixes
2015-08-08 09:56:25 +02:00
HarpyEagle
fc7e89380e
More material renames
...
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
PsiOmegaDelta
a6d9002806
Merge pull request #10442 from Baystation12/dev-freeze
...
Dev freeze
2015-08-07 10:37:47 +02:00
PsiOmegaDelta
8ca5d01dcf
Crematorium Destroy()
...
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
2015-08-06 08:39:24 +02:00
PsiOmegaDelta
863832b347
Post-merge fixes.
...
Renames define.
Re-corrects access checks.
2015-08-06 08:18:39 +02:00
PsiOmegaDelta
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
PsiOmegaDelta
87fcd408bd
Merge pull request #10436 from mwerezak/cult-construct-nightvision
...
Adds nightvision to cult constructs
2015-08-06 06:38:49 +02:00
mwerezak
0bc9468022
Merge pull request #10431 from PsiOmegaDelta/150805-HoloRuntime
...
Fixes holodeck runtime.
2015-08-05 23:06:04 -04:00
mwerezak
e5950d32d8
Merge pull request #10264 from RavingManiac/dev-freeze
...
Refactors floating and magboot checks. Fixes #10256
2015-08-05 23:05:34 -04:00
Kelenius
92ca942fa9
Fixes #10219 - cables don't always qdel
...
Dem snowflake code
2015-08-05 18:13:38 +03:00
PsiOmegaDelta
cf1ffd273a
Fixes holodeck runtime.
...
initial() doesn't work well with lists. Causes a null value.
2015-08-05 09:33:34 +02:00
PsiOmegaDelta
73a9c24017
Removes code in mob/living/bot/Life() that is now handled by mob/living/Life().
2015-08-05 09:26:43 +02:00
PsiOmegaDelta
3e266ab377
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-05 09:25:53 +02:00
PsiOmegaDelta
6b01a67c50
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32
c71d78ab1a
add debug verb as pAI-spawning adminverb
2015-08-05 00:50:04 +01:00
GinjaNinja32
595b58197d
fix pAI radios not working
2015-08-05 00:49:28 +01:00
GinjaNinja32
117ffca6d0
Merge pull request #10423 from Kelenius/ofBotsAndZAS
...
Of bots and ZAS
2015-08-04 13:26:30 +01:00
GinjaNinja32
9a4b53c765
Merge pull request #10360 from atlantiscze/beep-beep-beepsky
...
Fixes #10355
2015-08-04 12:36:35 +01:00
PsiOmegaDelta
93011f94c4
Merge pull request #10425 from Baystation12/dev-freeze
...
Dev
2015-08-04 13:07:11 +02:00
