Chinsky
4c628ff2c5
Merge pull request #10483 from PsiOmegaDelta/150811-AntagName
...
Fixes #10468 and #10467
2015-08-11 19:39:15 +03:00
Zuhayr
7bd301161f
Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes
...
Magical fixes.
2015-08-12 01:54:31 +09:30
Zuhayr
fab3939423
Merge pull request #10481 from PsiOmegaDelta/150811-CrewEfficiency
...
Crew monitor balance and lag fixes.
2015-08-12 01:18:32 +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
PsiOmegaDelta
54162f1c7d
Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes
2015-08-11 12:20:54 +02:00
PsiOmegaDelta
f85e9146ab
Fixes #10468 . Fixes #10467 .
...
Updates the DNA name as well, upon antag name change.
2015-08-11 12:11:32 +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
Kelenius
1324e69a19
Fixes #10466 - chem implant can't be loaded
...
What the literal shit.
2015-08-11 10:26:22 +03: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
PsiOmegaDelta
ef9ebdc741
Merge pull request #10476 from atlantiscze/emp-fix
...
Fixes #10446
2015-08-10 23:09:35 +02:00
Atlantis
dd79e0f481
Fixes lengthy emp_act() for turret controllers and doors.
...
- Turret controllers were the same as turrets. Now completely fixes #10446
- Doors also had 10ds sleep() in them, hidden under small probability roll. Fixed.
2015-08-10 23:04:37 +02:00
Atlantis
40cb786986
Adds EMP monitoring for future EMP debugging
...
- Adds possibility to enable EMP debugging, that monitors how long emp_act() took on object. If it took too long (configurable) it generates a message. It is disabled by default due to possible performance loss with large EMPs.
2015-08-10 22:58:33 +02:00
Atlantis
7297535750
Fixes mistake in turret code
...
- Turrets no longer freeze any EMP that hits them for 6-60 seconds.
2015-08-10 22:39:22 +02:00
Atlantis
d3dbf3c199
Adjusts names of two areas
...
- Messaging Server Room -> Research Server Room - That's the server room near toxins storage/misc. research. It has absolutely nothing to do with messaging, as it houses Research's servers only.
- AI Server Room -> Messaging Server Room - That's the actual server room that houses messaging server in central section of the station.
2015-08-10 21:39:35 +02:00
Chinsky
80c4158cc7
Merge pull request #10460 from PsiOmegaDelta/150809-NDVIcarus
...
Fixes #10447 .
2015-08-10 20:45:11 +03:00
PsiOmega
fb6ab23189
Makes the new initialization message use the proper method.
2015-08-10 17:46:38 +02:00
PsiOmega
a710e77d46
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/master_controller.dm
code/game/area/areas.dm
2015-08-10 17:42:40 +02:00
mwerezak
12549b7e93
Fixes area power initialization
...
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
2015-08-09 19:58:37 -04:00
mwerezak
c98b6a1d97
Merge pull request #10457 from Zuhayr/dev-freeze
...
Custom item rolldown.
2015-08-09 10:33:54 -04:00
mwerezak
15cbd0e0a2
Merge pull request #10461 from PsiOmegaDelta/150809-ExplosionGarbage
...
Explosion particle GC.
2015-08-09 09:36:54 -04:00
GinjaNinja32
575ab793a2
Merge pull request #10458 from PsiOmegaDelta/150809-DestroyBuildings
...
Fixes #10217 .
2015-08-09 12:43:08 +01:00
PsiOmega
d1a4f4b0a4
Compilation fixes and partial revert of #10456 .
2015-08-09 13:27:59 +02: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
6a15611711
Explosion particle GC.
...
Explosion particles cheated, only nulling the location and hoping to get collected one day.
2015-08-09 12:35:07 +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
mwerezak
83abfcf7af
Fixes #9594
...
Areas now initialize to having all power channels off.
2015-08-09 00:02:50 -04:00
mwerezak
1486876e73
Fixes #10449
...
Reimpements trace gas checking for air alarms. Removes duplicate danger level checking in air alarm nanoui code, as all of that is already calculated as part of air alarm processing.
2015-08-08 23:59:38 -04:00
PsiOmegaDelta
4ae754a59d
Merge pull request #10454 from mwerezak/chem-machine-fix
...
Fixes #10021
2015-08-08 19:16:47 +02:00
PsiOmegaDelta
431cc254cd
Merge pull request #10453 from mwerezak/robotlang-fix
...
Fixes #9966
2015-08-08 19:16:40 +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
mwerezak
d9ee308dbe
Merge pull request #10450 from GinjaNinja32/syndicate-beacon
...
Fix inverted arguments in syndicate beacon self-destruct
2015-08-08 10:59:15 -04:00
PsiOmegaDelta
c560bd8d79
Merge pull request #10404 from mwerezak/stack-fix
...
Material stack related fixes
2015-08-08 09:56:25 +02:00
GinjaNinja32
c1675bb32b
Fix inverted arguments in syndicate beacon self-destruct
...
Far less likely to gib people now.
2015-08-07 23:11:50 +01: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
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
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
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
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